From 2a0ad29f00b70e7a4576c6c870d10a894615b201 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 18:29:32 +0900
Subject: [PATCH] "사용자 관리" 프론트 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
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 2d009dd..8a7253e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -42,6 +42,7 @@
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
+import javax.rmi.CORBA.Util;
import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.net.HttpURLConnection;
@@ -227,7 +228,8 @@
this.userInviteService.includePrimaryWorkspace(user, primaryWorkspace);
-
+ UserLevel userLevel = this.userLevelService.getBasicUserLevel();
+ user.setUserLevel(userLevel);
// edit by zenith for permission at 20200803
/*user.setPermission(MngPermission.USER_PERMISSION_MNG_NONE);*/
@@ -237,6 +239,10 @@
UserLevel userLevel = this.userLevelService.addSuperUserLevel();
user.setUserLevel(userLevel);
+
+ this.userLevelService.addNormalAdminUserLevel();
+
+ this.userLevelService.addNormalUserLevel();
// DepartmentManagement�뿉 �엫�떆濡� Name, Description 媛� 異붽�
DepartmentManagementForm departmentManagementForm = new DepartmentManagementForm();
@@ -1069,7 +1075,7 @@
@Override
@Transactional(readOnly = true)
public List<User> findAdmin() {
- return this.userRepository.findAdmin();
+ return this.userRepository.findAdmin(MngPermission.makeAllPermission());
}
// �빐�떦 �궗�슜�옄媛� 愿�由ы븯�뒗 �뾽臾� 怨듦컙�쓣 留덉�留됱쑝濡� �젒洹쇳븳 �뾽臾� 怨듦컙 �젙蹂대줈 �뾽�뜲�씠�듃�븳�떎.
@@ -1193,7 +1199,7 @@
@Transactional(readOnly = true)
public User getUserSession(Map<String, Object> resJsonData, HttpServletRequest httpServletRequest) {
User user = this.getUser(this.webAppUtil.getLoginId());
- UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password", "permission");
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password","permission"); // wyu - ignores permission ??
// user�뿉�꽌 Permission 媛믪쓣 媛��졇���꽌 userVo �뿉 setPermission �븿
userVo.setPermission(user.getPermission());
userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
--
Gitblit v1.8.0