From 43a910170d8049ef99ba38cc2a81b99cad89fb0d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 15:59:17 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
index 6f6306d..95f21fb 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
@@ -40,7 +40,7 @@
private UserLevelService userLevelService;
@Autowired
- private DepartmentManageService departmentManageService;
+ private DepartmentService departmentService;
@Autowired
private UserWorkspaceMapper userWorkspaceMapper;
@@ -117,13 +117,13 @@
}
// 遺��꽌 蹂�寃�
- DepartmentManage currentDepartment = user.getDepartmentManage();
- if (currentDepartment == null || (userWorkspaceForm.getDepartmentId() != null && currentDepartment.getId() != userWorkspaceForm.getDepartmentId())) {
- // 遺��꽌紐� 蹂�寃쎌떆
- DepartmentManage departmentManage = this.departmentManageService.getDepartment(userWorkspaceForm.getDepartmentId());
- user.setDepartmentManage(departmentManage);
- userWorkspace.setUser(user);
- }
+// DepartmentManage currentDepartment = user.getDepartmentManage();
+// if (currentDepartment == null || (userWorkspaceForm.getDepartmentId() != null && currentDepartment.getId() != userWorkspaceForm.getDepartmentId())) {
+// // 遺��꽌紐� 蹂�寃쎌떆
+// DepartmentManage departmentManage = this.departmentService.getDepartment(userWorkspaceForm.getDepartmentId());
+// user.setDepartmentManage(departmentManage);
+// userWorkspace.setUser(user);
+// }
// 李몄뿬濡� �긽�깭瑜� 蹂�寃쏀븯�젮怨� �븷�븣
if (userWorkspace.getUseYn() != userWorkspaceForm.getUseYn()) {
--
Gitblit v1.8.0