From a9d6a8d9e53ff90b3bcea92a6f2c1c657206bbff Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 17:18:01 +0900
Subject: [PATCH] - 부서 관리 목록 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 a5d6f06..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;
@@ -106,24 +106,24 @@
public void modifyUserWorkspace(UserWorkspaceForm userWorkspaceForm) {
UserWorkspace userWorkspace = this.getUserWorkspace(userWorkspaceForm.getId());
- UserLevel currentUserlevel = userWorkspace.getUser().getUserLevel();
+ User user = userWorkspace.getUser();
+
+ // �궗�슜�옄 �벑湲� 蹂�寃�
+ UserLevel currentUserlevel = user.getUserLevel();
if (currentUserlevel.getId() != userWorkspaceForm.getLevelId()) {
- // �궗�슜�옄 �벑湲� 蹂�寃쎌떆
- User user = userWorkspace.getUser();
UserLevel userLevel = this.userLevelService.getUserLevel(userWorkspaceForm.getLevelId());
user.setUserLevel(userLevel);
userWorkspace.setUser(user);
}
- //todo 遺��꽌 蹂�寃쎌떆
- DepartmentManage currentDepartment = userWorkspace.getUser().getDepartmentManage();
- if (currentDepartment.getId() != userWorkspaceForm.getDepartmentId()) {
- // 遺��꽌紐� 蹂�寃쎌떆
- User user = userWorkspace.getUser();
- DepartmentManage departmentManage = this.departmentManageService.getDepartment(userWorkspaceForm.getLevelId());
- 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()) {
@@ -137,7 +137,7 @@
this.messageAccessor.getMessage(MsgConstants.WORKSPACE_MAX_USER_EXCESS_NOT_INCLUDE));
}
} else {
- User user = userWorkspace.getUser();
+ user = userWorkspace.getUser();
// 李몄뿬 ��湲� �궗�슜�옄媛� �쁽�옱 �빐�떦 �뾽臾� 怨듦컙�쓣 �궗�슜�븯怨� �엳�쓣 寃쎌슦 利됱떆 �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 �뒘湲곌쾶 �븳�떎.
if (user.getLastWorkspaceId().equals(userWorkspace.getWorkspace().getId())) {
// �뾽臾� 怨듦컙�뿉 李몄뿬�븯�뜕 �궗�슜�옄�뿉寃� �젣�쇅 �븣由� 諛� �솕硫� �깉濡쒓퀬移�
--
Gitblit v1.8.0