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/ProjectRole.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/ProjectRole.java b/src/main/java/kr/wisestone/owl/domain/ProjectRole.java
index 832baa0..e536973 100644
--- a/src/main/java/kr/wisestone/owl/domain/ProjectRole.java
+++ b/src/main/java/kr/wisestone/owl/domain/ProjectRole.java
@@ -30,6 +30,9 @@
private Set<ProjectRoleUser> projectRoleUsers = new HashSet<>();
@OneToMany(mappedBy="projectRole", cascade={CascadeType.ALL}, orphanRemoval=true)
+ private Set<ProjectRoleDepartment> projectRoleDepartments = new HashSet<>();
+
+ @OneToMany(mappedBy="projectRole", cascade={CascadeType.ALL}, orphanRemoval=true)
private Set<ProjectRolePermission> projectRolePermissions = new HashSet<>();
public ProjectRole(){}
@@ -80,6 +83,14 @@
this.projectRoleUsers = projectRoleUsers;
}
+ public Set<ProjectRoleDepartment> getProjectRoleDepartments() {
+ return projectRoleDepartments;
+ }
+
+ public void setProjectRoleDepartments(Set<ProjectRoleDepartment> projectRoleDepartments) {
+ this.projectRoleDepartments = projectRoleDepartments;
+ }
+
public Set<ProjectRolePermission> getProjectRolePermissions() {
return projectRolePermissions;
}
@@ -97,6 +108,15 @@
this.projectRoleUsers.add(projectRoleUser);
}
+ public void addDepartment(Department department) {
+ if (this.projectRoleDepartments == null) {
+ this.projectRoleDepartments = new HashSet<>();
+ }
+ ProjectRoleDepartment projectRoleDepartment = new ProjectRoleDepartment(this, department);
+
+ this.projectRoleDepartments.add(projectRoleDepartment);
+ }
+
public void removeProjectRole(User user) {
Iterator<ProjectRoleUser> iterator = this.projectRoleUsers.iterator();
--
Gitblit v1.8.0