From 179365a3f06e755fa687f84930ca059784b88fdf Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 22 12월 2021 17:40:56 +0900
Subject: [PATCH] 토큰값이 없을땐 복사버튼 숨김
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 5cf3422..f209240 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;
@@ -91,6 +90,9 @@
@Autowired
private ProjectService projectService;
+
+ @Autowired
+ private IssueTypeService issueTypeService;
@Autowired
private UserSecurityService userSecurityService;
@@ -258,7 +260,10 @@
this.userWorkspaceService.addUserWorkspace(user, workspace, true, true);
// 湲곕낯�쑝濡� �젣怨듬릺�뒗 �봽濡쒖젥�듃瑜� �깮�꽦�븳�떎.
-// this.projectService.addDefaultProject(user, workspace);
+ this.projectService.addDefaultProject(user, workspace);
+
+ // 湲곕낯�쑝濡� �젣怨듬릺�뒗 �봽濡쒖젥�듃瑜� �씠�뒋 �쑀�삎�쓽 �궗�슜 �봽濡쒖젥�듃濡� �꽕�젙
+ this.issueTypeService.addDefaultUsedProject(workspace);
user.setLastWorkspaceId(workspace.getId());
@@ -541,8 +546,12 @@
User user = this.getUser(userCondition.getId());
userVo = ConvertUtil.copyProperties(user, UserVo.class, "password");
userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
- }
+ Map<String, Object> projectManagerYN = this.projectRoleUserService.findProjectManager((userCondition.getId()));
+ if(projectManagerYN != null){
+ userVo.setProjectManagerYN(true);
+ }
+ }
resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
}
@@ -949,6 +958,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)
--
Gitblit v1.8.0