From 9ff3e8c43d01f758381b4925cff44502f1241750 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 14:26:36 +0900
Subject: [PATCH] - 일반 사용자로 검색 기능 제대로 동작안되는 문제 해결 - 이슈 유형에서 사용중인 프로젝트는 삭제 불가 - 이슈 유형에서 프로젝트 검색 시 워크스페이스 관리자는 모든 프로젝트 검색 가능(기존엔 참여하고있는 프로젝트만 검색가능하게되어있었음)
---
src/main/java/kr/wisestone/owl/domain/IssueType.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueType.java b/src/main/java/kr/wisestone/owl/domain/IssueType.java
index cd9fbfc..1e0ca66 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueType.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueType.java
@@ -21,7 +21,7 @@
private String name;
private String description;
private String color;
- private Long useCompany;
+ private Long usePartner;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "workspace_id")
@@ -34,6 +34,10 @@
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "project_id")
private Project project;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "complete_issue_status_id")
+ private IssueStatus issueStatus;
/*@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "company_id")
@@ -53,12 +57,13 @@
public IssueType(){}
- public IssueType(Workspace workspace, Workflow workflow, String name, String description, String color){
+ public IssueType(Workspace workspace, Workflow workflow, String name, String description, String color, Long usePartner){
this.workspace = workspace;
this.workflow = workflow;
this.name = name;
this.description = description;
this.color = color;
+ this.usePartner = usePartner;
}
public Long getId() {
@@ -125,11 +130,19 @@
this.project = project;
}
- public Long getUseCompany() {
- return useCompany;
+ public Long getUsePartner() {
+ return usePartner;
}
- public void setUseCompany(Long useCompany) {
- this.useCompany = useCompany;
+ public void setUsePartner(Long usePartner) {
+ this.usePartner = usePartner;
+ }
+
+ public IssueStatus getIssueStatus() {
+ return issueStatus;
+ }
+
+ public void setIssueStatus(IssueStatus issueStatus) {
+ this.issueStatus = issueStatus;
}
}
--
Gitblit v1.8.0