From 5a5753e69b2901cb3bb55623ca7d5beef2c727ab Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 11 11월 2021 15:19:00 +0900
Subject: [PATCH] 사용자 관리 부서 상세 백앤드 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 12 ++++++
src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java | 12 +-----
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 14 +++---
src/main/java/kr/wisestone/owl/vo/UserWorkspaceVo.java | 23 +++++++++++
src/main/java/kr/wisestone/owl/service/DepartmentService.java | 2 +
5 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/DepartmentService.java b/src/main/java/kr/wisestone/owl/service/DepartmentService.java
index 682ad46..8e45f0b 100644
--- a/src/main/java/kr/wisestone/owl/service/DepartmentService.java
+++ b/src/main/java/kr/wisestone/owl/service/DepartmentService.java
@@ -33,4 +33,6 @@
List<Map<String, Object>> findByDepartmentIds( UserCondition condition);
+
+
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
index c1c4f93..749724d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
@@ -105,17 +105,10 @@
}
for (Long id : departmentForm.getRemoveIds()) {
- if (!this.userService.useUserLevel(id)) {
- this.departmentRepository.deleteById(id);
- } else {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE));
- }
-
+ this.departmentRepository.deleteById(id);
+ this.departmentRepository.flush();
}
- this.departmentRepository.flush();
}
-
// 遺��꽌 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@@ -170,7 +163,6 @@
return department;
}
-
// �궘�젣 �븷 遺��꽌 �쑀��媛� �궗�슜�븯怨� �엳�뒗吏� �솗�씤
@Override
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
index 36b2936..71fe386 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -236,6 +236,13 @@
/*user.setPermission(MngPermission.USER_PERMISSION_MNG_NONE);*/
} else if(validAdmin == 1) { // �씪�씠�꽱�뒪 �엯�젰 愿�由ъ옄
+
+ DepartmentForm departmentForm = new DepartmentForm();
+
+ departmentForm.setDepartmentName("遺��꽌 �뾾�쓬");
+ Department department = this.departmentService.add(departmentForm);
+ this.departmentRepository.saveAndFlush(department);
+
Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();
UserLevel userLevel = this.userLevelService.addSuperUserLevel();
@@ -263,13 +270,6 @@
/*user.setPermission(MngPermission.makeSubAllPermission());*/
}
}
- DepartmentForm departmentForm = new DepartmentForm();
-
- departmentForm.setDepartmentName("遺��꽌 �뾾�쓬");
- Department department = this.departmentService.add(departmentForm);
-
- // wyu
- this.departmentRepository.saveAndFlush(department);
this.userRepository.saveAndFlush(user);
// �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩씠 怨듬갚�씠硫� �뵒�뤃�듃 �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩쑝濡� �꽕�젙�븳�떎.
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 1fc09fc..04a5e39 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
@@ -9,8 +9,10 @@
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.vo.DepartmentVo;
import kr.wisestone.owl.vo.ResPage;
import kr.wisestone.owl.vo.UserWorkspaceVo;
+import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserWorkspaceCondition;
import kr.wisestone.owl.web.form.UserWorkspaceForm;
import org.slf4j.Logger;
@@ -91,6 +93,16 @@
for (UserWorkspaceVo userWorkspaceVo : userWorkspaceVos) {
userWorkspaceVo.setAccount(CommonUtil.decryptAES128(userWorkspaceVo.getAccount()));
+
+ // UserCondition �뒗 �썝�옒 userId 媛� �뾾�뿀�떎.
+ UserCondition con = new UserCondition();
+ // 洹몃옒�꽌 Condition�뿉 異붽� �빐二쇨퀬 set �븯�뒗�뜲 洹멸굔 userWorkspaceVo �뿉�꽌 Id 瑜� 媛��졇�삩�떎
+ con.setId(userWorkspaceVo.getUserId());
+ // findByDepartmentIds �씪�뒗嫄� mapper濡� 留뚮뱾�뼱�꽌 荑쇰━ for臾몄쓣 �룎由ш퀬 us
+ List<Map<String, Object>> re = this.departmentService.findByDepartmentIds(con);
+ List<DepartmentVo> vos = ConvertUtil.convertListToListClass(re, DepartmentVo.class);
+
+ userWorkspaceVo.setDepartmentVos(vos);
}
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
diff --git a/src/main/java/kr/wisestone/owl/vo/UserWorkspaceVo.java b/src/main/java/kr/wisestone/owl/vo/UserWorkspaceVo.java
index b4921bd..779aeb8 100644
--- a/src/main/java/kr/wisestone/owl/vo/UserWorkspaceVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/UserWorkspaceVo.java
@@ -1,5 +1,9 @@
package kr.wisestone.owl.vo;
+import com.google.common.collect.Lists;
+
+import java.util.List;
+
/**
* Created by wisestone on 2018-10-02.
*/
@@ -11,6 +15,9 @@
private Boolean useYn;
private Long levelId;
private Long departmentId;
+ private Long userId;
+
+ private List<DepartmentVo> departmentVos = Lists.newArrayList();
public UserWorkspaceVo(){}
@@ -69,4 +76,20 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
+
+ public List<DepartmentVo> getDepartmentVos() {
+ return departmentVos;
+ }
+
+ public void setDepartmentVos(List<DepartmentVo> departmentVos) {
+ this.departmentVos = departmentVos;
+ }
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
}
--
Gitblit v1.8.0