From a4efd2c5d8f2c31d3bfb6860c58af5cb62606c9a Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 05 11월 2021 10:51:38 +0900
Subject: [PATCH] 부서관리 테이블 변경 및 언어팩 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 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 6271319..a5d6f06 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
@@ -2,17 +2,11 @@
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.domain.User;
-import kr.wisestone.owl.domain.UserLevel;
-import kr.wisestone.owl.domain.UserWorkspace;
-import kr.wisestone.owl.domain.Workspace;
+import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.UserWorkspaceMapper;
import kr.wisestone.owl.repository.UserWorkspaceRepository;
-import kr.wisestone.owl.service.UserLevelService;
-import kr.wisestone.owl.service.UserService;
-import kr.wisestone.owl.service.UserWorkspaceService;
-import kr.wisestone.owl.service.WorkspaceService;
+import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.vo.ResPage;
@@ -44,6 +38,9 @@
@Autowired
private UserLevelService userLevelService;
+
+ @Autowired
+ private DepartmentManageService departmentManageService;
@Autowired
private UserWorkspaceMapper userWorkspaceMapper;
@@ -119,6 +116,14 @@
}
//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);
+ }
// 李몄뿬濡� �긽�깭瑜� 蹂�寃쏀븯�젮怨� �븷�븣
if (userWorkspace.getUseYn() != userWorkspaceForm.getUseYn()) {
--
Gitblit v1.8.0