From e95d6811a018fd5cf18ed70f17a1f461c8010225 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 목, 09 12월 2021 16:07:20 +0900 Subject: [PATCH] 완료 이슈 숨기기 기능 수정 --- src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 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..09ccec0 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java @@ -93,6 +93,9 @@ private ProjectService projectService; @Autowired + private IssueTypeService issueTypeService; + + @Autowired private UserSecurityService userSecurityService; @Autowired @@ -258,7 +261,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 +547,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); } -- Gitblit v1.8.0