From 531f9e447b36adf6581cb1ecd54aefd007d7aa39 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 일, 12 12월 2021 21:48:26 +0900
Subject: [PATCH] - 오류 수정(롤백)

---
 src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 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 0001712..96bcc28 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);
     }
 
@@ -1064,6 +1074,30 @@
         resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
     }
 
+    //  留덉�留됱쑝濡� �꽑�깮�븳 �씠�뒋 ���엯 �젙蹂대�� ���옣�븳�떎.
+    @Override
+    @Transactional
+    public void updateLastIssueType(Map<String, Object> resJsonData, UserForm userForm) {
+        User user = this.getUser(this.webAppUtil.getLoginId());
+
+        if (userForm.getLastIssueTypeId() != null) {
+            user.setLastIssueTypeId(userForm.getLastIssueTypeId());
+        }
+
+        this.userRepository.saveAndFlush(user);
+        //  �꽭�뀡 �뾽�뜲�씠�듃
+        SecurityUtils.setUserToSession(user);
+        //  �겢�씪�씠�뼵�듃�쓽 �궗�슜�옄 �젙蹂� �뾽�뜲�씠�듃
+        UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password");
+
+        if (user.getSocialType() != null) {
+            userVo.setSocialType(user.getSocialType().toString());
+        }
+
+        userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
+
+        resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
+    }
     //  �듅�젙 �븘�씠�뵒�뿉 �빐�떦�븯�뒗 �궗�슜�옄 紐⑸줉�쓣 媛��졇�삩�떎.
     @Override
     @Transactional(readOnly = true)

--
Gitblit v1.8.0