From f01dc01ba632addc8e893fea0843a3d77aac7e25 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 18 11월 2021 09:41:54 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/domain/Department.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..aaf363e 100644
--- a/src/main/java/kr/wisestone/owl/domain/Department.java
+++ b/src/main/java/kr/wisestone/owl/domain/Department.java
@@ -17,7 +17,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 +46,12 @@
this.departmentDescription = departmentDescription;
}
- /*public void addProjectRole(ProjectRole projectRole) {
+ public void addProjectRole(ProjectRole projectRole) {
if (this.projectRoleDepartments == null) {
- this.projectRoleDepartments = new HashSet<>();
+ this.projectRoleDepartments = new HashSet<ProjectRoleDepartment>();
}
- ProjectRoleUser projectRoleUser = new ProjectRoleUser(projectRole, this);
+ ProjectRoleDepartment projectRoleDepartment = new ProjectRoleDepartment(projectRole, this);
- this.projectRoleDepartments.add(projectRoleUser);
- }*/
+ this.projectRoleDepartments.add(projectRoleDepartment);
+ }
}
--
Gitblit v1.8.0