From e78751f6a7a487f3c46196ac7060e0685883c93f Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 11 11월 2021 09:41:45 +0900
Subject: [PATCH] 사용자 관리 부서 상세 백앤드 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 68fa9a5..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,6 +12,7 @@
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.*;
@@ -54,6 +55,9 @@
@Autowired
private UserRepository userRepository;
+
+ @Autowired
+ private DepartmentRepository departmentRepository;
@Autowired
private UserLevelService userLevelService;
@@ -259,13 +263,13 @@
/*user.setPermission(MngPermission.makeSubAllPermission());*/
}
}
+ DepartmentForm departmentForm = new DepartmentForm();
-// DepartmentManageForm departmentManageForm = new DepartmentManageForm();
-//
-// 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);
// �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩씠 怨듬갚�씠硫� �뵒�뤃�듃 �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩쑝濡� �꽕�젙�븳�떎.
@@ -1195,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