From 524dc660327c6cdd6eb20ef5d2feb4afd9c3db00 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 08 11월 2021 09:37:04 +0900
Subject: [PATCH] 오류 메시지 수정 및 버그 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 8a7253e..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;
@@ -244,13 +241,13 @@
this.userLevelService.addNormalUserLevel();
- // DepartmentManagement�뿉 �엫�떆濡� Name, Description 媛� 異붽�
- DepartmentManagementForm departmentManagementForm = new DepartmentManagementForm();
+ // DepartmentManage�뿉 �엫�떆濡� Name, Description 媛� 異붽�
+ DepartmentManageForm departmentManageForm = new DepartmentManageForm();
- departmentManagementForm.setDepartmentName("媛쒕컻��");
- departmentManagementForm.setDepartmentDescription("�쎒�궗�씠�듃 諛� �빋 �꽌鍮꾩뒪 媛쒕컻");
- DepartmentManagement departmentManagement = this.departmentManagementService.addDepartment(departmentManagementForm);
- user.setDepartmentId(departmentManagement);
+ departmentManageForm.setDepartmentName("媛쒕컻��");
+ departmentManageForm.setDepartmentDescription("�쎒�궗�씠�듃 諛� �빋 �꽌鍮꾩뒪 媛쒕컻");
+ DepartmentManage departmentManage = this.departmentManageService.addDepartmentManage(departmentManageForm);
+ user.setDepartmentManage(departmentManage);
if(primaryWorkspace == null || primaryWorkspace.getName() != userForm.getWorkspaceName()) {
// �뾽臾� 怨듦컙瑜� �깮�꽦�븳�떎. 媛��엯�븳 �궗�슜�옄�뒗 �뾽臾� 怨듦컙�쓽 二쇱씤�씠�떎.
--
Gitblit v1.8.0