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 | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 f8566be..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,9 +17,8 @@
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.UserCondition;
-import kr.wisestone.owl.web.form.DepartmentManagementForm;
+import kr.wisestone.owl.web.form.DepartmentManageForm;
import kr.wisestone.owl.web.form.UserForm;
-import kr.wisestone.owl.web.form.UserLevelForm;
import kr.wisestone.owl.web.view.ExcelView;
import org.apache.commons.validator.routines.EmailValidator;
import org.slf4j.Logger;
@@ -34,7 +33,6 @@
import org.springframework.security.core.session.SessionRegistry;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model;
@@ -42,7 +40,6 @@
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;
@@ -62,7 +59,7 @@
private UserLevelService userLevelService;
@Autowired
- private DepartmentManagementService departmentManagementService;
+ private DepartmentManageService departmentManageService;
@Autowired
private SystemRoleService systemRoleService;
@@ -228,7 +225,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);*/
@@ -239,13 +237,17 @@
UserLevel userLevel = this.userLevelService.addSuperUserLevel();
user.setUserLevel(userLevel);
- // DepartmentManagement�뿉 �엫�떆濡� Name, Description 媛� 異붽�
- DepartmentManagementForm departmentManagementForm = new DepartmentManagementForm();
+ this.userLevelService.addNormalAdminUserLevel();
- departmentManagementForm.setDepartmentName("媛쒕컻��");
- departmentManagementForm.setDepartmentDescription("�쎒�궗�씠�듃 諛� �빋 �꽌鍮꾩뒪 媛쒕컻");
- DepartmentManagement departmentManagement = this.departmentManagementService.addDepartment(departmentManagementForm);
- user.setDepartmentId(departmentManagement);
+ 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()) {
// �뾽臾� 怨듦컙瑜� �깮�꽦�븳�떎. 媛��엯�븳 �궗�슜�옄�뒗 �뾽臾� 怨듦컙�쓽 二쇱씤�씠�떎.
@@ -1194,7 +1196,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