From 12a790240ef0301f839a55e1846ed0c5a32dffee Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 07 12월 2021 13:29:34 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index ff02b9d..1c33b93 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -18,6 +18,7 @@
 import kr.wisestone.owl.mapper.IssueMapper;
 import kr.wisestone.owl.mapper.ProjectMapper;
 import kr.wisestone.owl.repository.IssueRepository;
+import kr.wisestone.owl.repository.UserDepartmentRepository;
 import kr.wisestone.owl.service.*;
 import kr.wisestone.owl.util.*;
 import kr.wisestone.owl.util.DateUtil;
@@ -163,6 +164,9 @@
 
     @Autowired
     private SimpMessagingTemplate simpMessagingTemplate;
+
+    @Autowired
+    private UserDepartmentRepository userDepartmentRepository;
 
     @Override
     protected JpaRepository<Issue, Long> getRepository() {
@@ -660,6 +664,19 @@
         }
     }
 
+    void SetMyDepartmentId(IssueCondition issueCondition){
+        Long loginId = issueCondition.getLoginUserId();
+        List<Long> myDepartmentIds = Lists.newArrayList();
+        List<UserDepartment> myDepartments = this.userDepartmentRepository.findByUserId(loginId);
+
+        if(myDepartments != null && myDepartments.size() > 0){
+            for(UserDepartment myDepartment : myDepartments){
+                myDepartmentIds.add(myDepartment.getDepartmentId());
+            }
+        }
+        issueCondition.setMyDepartmentIds(myDepartmentIds);
+    }
+
     //  �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
     @Override
     @Transactional(readOnly = true)
@@ -690,12 +707,25 @@
         List<String> issueKeys = Lists.newArrayList(issueIds);
         issueCondition.setIssueIds(issueKeys);
 
-        List<Map<String, Object>> results = this.issueMapper.find(issueCondition);
+        issueCondition.setLoginUserId(this.webAppUtil.getLoginId());
+        issueCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+        User user = this.webAppUtil.getLoginUserObject();
+
+        List<Map<String, Object>> results = Lists.newArrayList();
+        Long totalCount = 0L;
+
+        if (this.userWorkspaceService.checkWorkspaceManager(user)) {
+            results = this.issueMapper.find(issueCondition);
+            totalCount = this.issueMapper.count(issueCondition);
+        } else{
+            this.SetMyDepartmentId(issueCondition);
+            results = this.issueMapper.findByDepartment(issueCondition);
+            totalCount = this.issueMapper.countByDepartment(issueCondition);
+        }
 
         //  �뒠�떇 �쟾 - 0.8, 0.9, 0.9, 0.9, 0.9
         /*StopWatch serviceStart = new StopWatch();
         serviceStart.start();*/
-        Long totalCount = this.issueMapper.count(issueCondition);
         //  �뒠�떇 �쟾 - 1.1, 1.1, 1.3, 1.2
 
         /*serviceStart.stop();
@@ -705,7 +735,6 @@
         //  �씠�뒋 �븘�씠�뵒 珥덇린�솕
         issueCondition.setIssueIds(Lists.newArrayList());
         //  Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
-        User user = this.webAppUtil.getLoginUserObject();
         this.setMapToIssueVo(results, issueVos, issueCondition, user);
 
         this.setCountDownIssues(results, issueVos);
@@ -719,21 +748,33 @@
         return issueVos;
     }
 
-    private void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos) {
+    @Override
+    @Transactional(readOnly = true)
+    public void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos) {
         for (Map<String, Object> result : results){
             List<Issue> downIssues = this.issueRepository.findByParentIssueId((Long) result.get("id")); //�븯�쐞�씠�뒋 媛��졇�삤湲�
             if(downIssues != null && downIssues.size() > 0){ //�긽�쐞�씠�뒋 媛�吏�怨� �엳�뒗 �븷�뱾�씠 �엳�쑝硫�
-                int downIssueCount = 0;
+                int downIssueAllCount = 0;// �븯�쐞�씠�뒋 �쟾泥� 移댁슫�듃
+                int downIssueCount = 0;// �븯�쐞�씠�뒋 誘몄셿猷� 移댁슫�듃
                 for(Issue downIssue : downIssues){
-                    downIssueCount ++;
+                    downIssueAllCount ++;
                     Long parentIssueId = downIssue.getParentIssue().getId();
                     Issue parentIssue = this.getIssue(parentIssueId);
                     IssueVo parentIssueVo = ConvertUtil.copyProperties(parentIssue, IssueVo.class);
-                    parentIssueVo.setDownIssueCount(downIssueCount);
+                    parentIssueVo.setDownIssueAllCount(downIssueAllCount);
+
+                    IssueStatus downIssueStatus = this.issueStatusService.getIssueStatus(downIssue.getIssueStatus().getId());
+                    IssueVo downIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
+                    downIssueVo.setIssueStatusType(downIssueStatus.getIssueStatusType().toString());
+
+                    if(!downIssueVo.getIssueStatusType().equals("CLOSE")){ //誘몄셿猷� �븯�쐞�씠�뒋 泥댄겕
+                        downIssueCount ++;
+                    }
 
                     for(IssueVo issueVo : issueVos){
                         if(issueVo.getId().equals(parentIssueVo.getId())){
-                            issueVo.setDownIssueCount(parentIssueVo.getDownIssueCount());
+                            issueVo.setDownIssueCount(downIssueCount);
+                            issueVo.setDownIssueAllCount(parentIssueVo.getDownIssueAllCount());
                         }
                     }
                 }

--
Gitblit v1.8.0