From 6e2f9c845610bc1d6a1e3b458b560ab2462995de Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 금, 07 1월 2022 09:23:56 +0900
Subject: [PATCH] - 사용하지 않는 permission 항목 제거
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 09ccec0..721537c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -18,7 +18,6 @@
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.UserCondition;
-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;
@@ -106,6 +105,9 @@
@Autowired
private AttachedFileService attachedFileService;
+
+ @Autowired
+ private UserDepartmentService userDepartmentService;
@Autowired
private IssueService issueService;
@@ -264,7 +266,7 @@
this.projectService.addDefaultProject(user, workspace);
// 湲곕낯�쑝濡� �젣怨듬릺�뒗 �봽濡쒖젥�듃瑜� �씠�뒋 �쑀�삎�쓽 �궗�슜 �봽濡쒖젥�듃濡� �꽕�젙
- //this.issueTypeService.addDefaultUsedProject(workspace);
+ this.issueTypeService.addDefaultUsedProject(workspace);
user.setLastWorkspaceId(workspace.getId());
@@ -959,6 +961,15 @@
return this.convertUserVoToMap(results, totalUsersCount, pageable, resJsonData);
}
+ // �궗�슜�옄 �젙蹂대�� 媛��졇�삩�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public void findMyLevelAndDepartment(Map<String, Object> resJsonData) {
+ Long loginId = this.webAppUtil.getLoginId();
+ Map<String, Object> result = this.userMapper.findByMyLevelAndDepartment(loginId);
+ resJsonData.put(Constants.RES_KEY_CONTENTS, result);
+ }
+
// �궗�슜�옄 �븘�씠�뵒濡� �궗�슜�옄瑜� 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
@@ -1233,10 +1244,19 @@
@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");
// user�뿉�꽌 Permission 媛믪쓣 媛��졇���꽌 userVo �뿉 setPermission �븿
- userVo.setPermission(user.getPermission());
userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
+
+ UserLevel userLevel = user.getUserLevel();
+ if (userLevel != null) {
+ userVo.setLevelName(userLevel.getLevelName());
+ }
+
+ List<Department> departments = this.userDepartmentService.findDepartment(user.getId());
+ if (departments != null) {
+ userVo.setDepartmentVos(ConvertUtil.convertObjectsToClasses(departments, DepartmentVo.class));
+ }
resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
// �궗�슜�옄 �꽭�뀡 �젙蹂대�� 遺꾩꽍�빐�꽌 濡쒓렇�뿉 �궓湲대떎.
log.info(ElasticSearchUtil.makeUserSessionHistoryMessage(httpServletRequest, userVo));
--
Gitblit v1.8.0