From 12ae7c239f1d17c267b6038d49c31e954afd44fb Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 04 11월 2021 11:44:02 +0900
Subject: [PATCH] - etc 메뉴추가 => 업체 관리/ISP관리/호스팅 관리 메뉴 추가 => 관련 파일들만 추가. 추가 구현 필요.
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 07b26f1..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);*/
@@ -235,14 +237,12 @@
} else if(validAdmin == 1) { // �씪�씠�꽱�뒪 �엯�젰 愿�由ъ옄
Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();
- // UserLevel�뿉 Permission 媛� �꽔�뼱以�
- UserLevelForm userLevelForm = new UserLevelForm();
- // Constants �뿉�꽌 ADMIN 媛� 異붽�
- userLevelForm.setLevelName(Constants.ADMIN_MANAGER);
- // Permission 媛� 異붽�
- userLevelForm.setPermission(MngPermission.makeAllPermission());
- UserLevel userLevel = this.userLevelService.addUserLevel(userLevelForm);
+ UserLevel userLevel = this.userLevelService.addSuperUserLevel();
user.setUserLevel(userLevel);
+
+ this.userLevelService.addNormalAdminUserLevel();
+
+ this.userLevelService.addNormalUserLevel();
// DepartmentManagement�뿉 �엫�떆濡� Name, Description 媛� 異붽�
DepartmentManagementForm departmentManagementForm = new DepartmentManagementForm();
@@ -1033,6 +1033,12 @@
this.userRepository.saveAndFlush(user);
}
+ // �궘�젣 �븷 �벑湲됰챸�쓣 �쑀��媛� �궗�슜�븯怨� �엳�뒗吏� �솗�씤
+ @Override
+ public boolean useUserLevel(Long levelId) {
+ return this.userMapper.findByLevelId(levelId) > 0;
+ }
+
// 留덉�留됱쑝濡� �꽑�깮�븳 �봽濡쒖젥�듃 �젙蹂대�� ���옣�븳�떎.
@Override
@Transactional
@@ -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