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/UserServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 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 bf2204e..47e33bb 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -17,6 +17,7 @@
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.UserCondition;
+import kr.wisestone.owl.web.form.DepartmentManageForm;
import kr.wisestone.owl.web.form.UserForm;
import kr.wisestone.owl.web.view.ExcelView;
import org.apache.commons.validator.routines.EmailValidator;
@@ -53,6 +54,12 @@
@Autowired
private UserRepository userRepository;
+
+ @Autowired
+ private UserLevelService userLevelService;
+
+ @Autowired
+ private DepartmentManageService departmentManageService;
@Autowired
private SystemRoleService systemRoleService;
@@ -197,7 +204,8 @@
user.setAccount(CommonUtil.encryptAES128(userForm.getAccount()));
user.setPassword(this.passwordEncoder.encode(user.getPassword()));
- this.userRepository.saveAndFlush(user);
+ //this.userLevelRepository.saveAndFlush(user);
+ //userLevelRepository.saveAndFlush(user);
// �봽濡쒗븘 �뙆�씪�씠 �쑀�슚�븳吏� 泥댄겕�븳�떎.
this.verifyProfile(profile);
@@ -217,11 +225,29 @@
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);
+ /*user.setPermission(MngPermission.USER_PERMISSION_MNG_NONE);*/
} else if(validAdmin == 1) { // �씪�씠�꽱�뒪 �엯�젰 愿�由ъ옄
Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();
+
+ UserLevel userLevel = this.userLevelService.addSuperUserLevel();
+ user.setUserLevel(userLevel);
+
+ this.userLevelService.addNormalAdminUserLevel();
+
+ this.userLevelService.addNormalUserLevel();
+
+ // DepartmentManage�뿉 �엫�떆濡� Name, Description 媛� 異붽�
+ DepartmentManageForm departmentManageForm = new DepartmentManageForm();
+
+ departmentManageForm.setDepartmentName("媛쒕컻��");
+ departmentManageForm.setDepartmentDescription("�쎒�궗�씠�듃 諛� �빋 �꽌鍮꾩뒪 媛쒕컻");
+ DepartmentManage departmentManage = this.departmentManageService.addDepartmentManage(departmentManageForm);
+ user.setDepartmentManage(departmentManage);
if(primaryWorkspace == null || primaryWorkspace.getName() != userForm.getWorkspaceName()) {
// �뾽臾� 怨듦컙瑜� �깮�꽦�븳�떎. 媛��엯�븳 �궗�슜�옄�뒗 �뾽臾� 怨듦컙�쓽 二쇱씤�씠�떎.
@@ -234,18 +260,17 @@
user.setLastWorkspaceId(workspace.getId());
// edit by zenith for permission at 20200803
- user.setPermission(MngPermission.makeAllPermission());
+ //user.setPermission(MngPermission.makeAllPermission());
} else {
this.userInviteService.includePrimaryWorkspace(user, primaryWorkspace);
user.setLastWorkspaceId(primaryWorkspace.getId());
-
- user.setPermission(MngPermission.makeSubAllPermission());
+ /*user.setPermission(MngPermission.makeSubAllPermission());*/
}
}
+ this.userRepository.saveAndFlush(user);
// �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩씠 怨듬갚�씠硫� �뵒�뤃�듃 �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩쑝濡� �꽕�젙�븳�떎.
user.setReservationNotifyTime(User.DEFAULT_RESERVATION_NOTIFY_TIME);
- this.userRepository.saveAndFlush(user);
// 珥덈�諛쏆� 硫붿씪�씠 �엳�뒗 �궗�슜�옄媛� 媛��엯�뻽�쑝硫� 珥덈��뻽�쓣 �븣 �꽑�깮�븳 �봽濡쒖젥�듃�뿉 李몄뿬 �떆�궓�떎.
this.userInviteService.checkInviteUser(user);
@@ -1005,7 +1030,13 @@
this.userRepository.saveAndFlush(user);
}
- // 留덉�留됱쑝濡� �꽑�깮�븳 �봽濡쒖젥�듃 �젙蹂대�� ���옣�븳�떎.
+ // �궘�젣 �븷 �벑湲됰챸�쓣 �쑀��媛� �궗�슜�븯怨� �엳�뒗吏� �솗�씤
+ @Override
+ public boolean useUserLevel(Long levelId) {
+ return this.userMapper.findByLevelId(levelId) > 0;
+ }
+
+ // 留덉�留됱쑝濡� �꽑�깮�븳 �봽濡쒖젥�듃 �젙蹂대�� ���옣�븳�떎.
@Override
@Transactional
public void updateLastProject(Map<String, Object> resJsonData, UserForm userForm) {
@@ -1041,7 +1072,7 @@
@Override
@Transactional(readOnly = true)
public List<User> findAdmin() {
- return this.userRepository.findAdmin();
+ return this.userRepository.findAdmin(MngPermission.makeAllPermission());
}
// �빐�떦 �궗�슜�옄媛� 愿�由ы븯�뒗 �뾽臾� 怨듦컙�쓣 留덉�留됱쑝濡� �젒洹쇳븳 �뾽臾� 怨듦컙 �젙蹂대줈 �뾽�뜲�씠�듃�븳�떎.
@@ -1150,6 +1181,7 @@
}
}
+
// �뾽臾� 怨듦컙�뿉�꽌 �젣�쇅�릺嫄곕굹 �뾽臾� 怨듦컙 �궘�젣�떆 李몄뿬 �궗�슜�옄�뱾�쓽 留덉�留� �젒洹� �뾽臾� 怨듦컙 �젙蹂대줈 �꽭�뀡 �뾽�뜲�씠�듃�븯湲� �쐞�빐 �궗�슜
@Override
@Transactional(readOnly = true)
@@ -1164,7 +1196,9 @@
@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");
+ 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()));
resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
// �궗�슜�옄 �꽭�뀡 �젙蹂대�� 遺꾩꽍�빐�꽌 濡쒓렇�뿉 �궓湲대떎.
--
Gitblit v1.8.0