From e7c0ff25749d77b25fdad019861c1a5a444b21dd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 26 11월 2021 00:36:48 +0900
Subject: [PATCH] 언어팩 수정, 간단한 오류 수정 [프론트]
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 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..e906deb 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -12,14 +12,14 @@
import kr.wisestone.owl.domain.enumType.SocialType;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.UserMapper;
+import kr.wisestone.owl.repository.DepartmentRepository;
import kr.wisestone.owl.repository.UserRepository;
import kr.wisestone.owl.service.*;
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.DepartmentForm;
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 +34,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 +41,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;
@@ -59,10 +57,13 @@
private UserRepository userRepository;
@Autowired
+ private DepartmentRepository departmentRepository;
+
+ @Autowired
private UserLevelService userLevelService;
@Autowired
- private DepartmentManagementService departmentManagementService;
+ private DepartmentService departmentService;
@Autowired
private SystemRoleService systemRoleService;
@@ -228,24 +229,28 @@
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);*/
} 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();
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();
if(primaryWorkspace == null || primaryWorkspace.getName() != userForm.getWorkspaceName()) {
// �뾽臾� 怨듦컙瑜� �깮�꽦�븳�떎. 媛��엯�븳 �궗�슜�옄�뒗 �뾽臾� 怨듦컙�쓽 二쇱씤�씠�떎.
@@ -1194,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");
// user�뿉�꽌 Permission 媛믪쓣 媛��졇���꽌 userVo �뿉 setPermission �븿
userVo.setPermission(user.getPermission());
userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
--
Gitblit v1.8.0