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/Department.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/Department.java b/src/main/java/kr/wisestone/owl/domain/Department.java
index 4a09dbf..1fad1bd 100644
--- a/src/main/java/kr/wisestone/owl/domain/Department.java
+++ b/src/main/java/kr/wisestone/owl/domain/Department.java
@@ -3,6 +3,7 @@
import javax.persistence.*;
import java.io.Serializable;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Set;
@Entity
@@ -17,7 +18,7 @@
private String departmentDescription;
@OneToMany(mappedBy = "department", cascade = {CascadeType.ALL}, orphanRemoval = true)
- private Set<ProjectRoleUser> projectRoleDepartments = new HashSet<>();
+ private Set<ProjectRoleDepartment> projectRoleDepartments = new HashSet<ProjectRoleDepartment>();
public Department() {
}
@@ -46,12 +47,24 @@
this.departmentDescription = departmentDescription;
}
- /*public void addProjectRole(ProjectRole projectRole) {
+ public void addProjectRole(ProjectRole projectRole) {
if (this.projectRoleDepartments == null) {
this.projectRoleDepartments = new HashSet<>();
}
- ProjectRoleUser projectRoleUser = new ProjectRoleUser(projectRole, this);
+ ProjectRoleDepartment projectRoleDepartment = new ProjectRoleDepartment(projectRole, this);
- this.projectRoleDepartments.add(projectRoleUser);
- }*/
+ this.projectRoleDepartments.add(projectRoleDepartment);
+ }
+
+ public void removeProjectRole(ProjectRole projectRole) {
+ Iterator<ProjectRoleDepartment> iterator = this.projectRoleDepartments.iterator();
+
+ while (iterator.hasNext()) {
+ ProjectRoleDepartment projectRoleDepartment = iterator.next();
+ if (projectRole.getId().equals(projectRoleDepartment.getProjectRole().getId())) {
+ this.projectRoleDepartments.remove(projectRoleDepartment);
+ break;
+ }
+ }
+ }
}
--
Gitblit v1.8.0