From fe1b9e8b4e54fb22022a0d13cc57b72bc8ba9840 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 05 11월 2021 19:12:00 +0900
Subject: [PATCH] "부서 관리" 및 "사용자 관리" 프론트 완료
---
src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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..6f6306d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
@@ -106,21 +106,21 @@
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()) {
+ // 遺��꽌 蹂�寃�
+ DepartmentManage currentDepartment = user.getDepartmentManage();
+ if (currentDepartment == null || (userWorkspaceForm.getDepartmentId() != null && currentDepartment.getId() != userWorkspaceForm.getDepartmentId())) {
// 遺��꽌紐� 蹂�寃쎌떆
- User user = userWorkspace.getUser();
- DepartmentManage departmentManage = this.departmentManageService.getDepartment(userWorkspaceForm.getLevelId());
+ DepartmentManage departmentManage = this.departmentManageService.getDepartment(userWorkspaceForm.getDepartmentId());
user.setDepartmentManage(departmentManage);
userWorkspace.setUser(user);
}
@@ -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