From af331da8a4b05a77f535438a57b7b05c792f95d4 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 16:00:28 +0900
Subject: [PATCH] - 세션 만료 시간 항목 추가

---
 src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 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 f83eb6a..36b2936 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -12,12 +12,13 @@
 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.DepartmentManageForm;
+import kr.wisestone.owl.web.form.DepartmentForm;
 import kr.wisestone.owl.web.form.UserForm;
 import kr.wisestone.owl.web.view.ExcelView;
 import org.apache.commons.validator.routines.EmailValidator;
@@ -56,10 +57,13 @@
     private UserRepository userRepository;
 
     @Autowired
+    private DepartmentRepository departmentRepository;
+
+    @Autowired
     private UserLevelService userLevelService;
 
     @Autowired
-    private DepartmentManageService departmentManageService;
+    private DepartmentService departmentService;
 
     @Autowired
     private SystemRoleService systemRoleService;
@@ -259,11 +263,13 @@
                 /*user.setPermission(MngPermission.makeSubAllPermission());*/
             }
         }
-        DepartmentManageForm departmentManageForm = new DepartmentManageForm();
+        DepartmentForm departmentForm = new DepartmentForm();
 
-        departmentManageForm.setDepartmentName("遺��꽌 �뾾�쓬");
-        DepartmentManage departmentManage = this.departmentManageService.addDepartmentManage(departmentManageForm);
-        user.setDepartmentManage(departmentManage);
+        departmentForm.setDepartmentName("遺��꽌 �뾾�쓬");
+        Department department = this.departmentService.add(departmentForm);
+
+        // wyu
+        this.departmentRepository.saveAndFlush(department);
         this.userRepository.saveAndFlush(user);
 
         //  �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩씠 怨듬갚�씠硫� �뵒�뤃�듃 �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩쑝濡� �꽕�젙�븳�떎.
@@ -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"); // wyu - ignores 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