From 43a8e9281c71f21b0e683e63def386d1ec0209bd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 일, 05 12월 2021 17:44:21 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java |  297 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 219 insertions(+), 78 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 f3aeac1..eb5524e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -7,6 +7,7 @@
 import kr.wisestone.owl.constant.ElasticSearchConstants;
 import kr.wisestone.owl.constant.MsgConstants;
 import kr.wisestone.owl.constant.UsePartner;
+import kr.wisestone.owl.data.CheckIssueData;
 import kr.wisestone.owl.domain.*;
 import kr.wisestone.owl.domain.enumType.CustomFieldType;
 import kr.wisestone.owl.domain.enumType.EmailType;
@@ -52,9 +53,6 @@
     private IssueRepository issueRepository;
 
     @Autowired
-    private IssueTableConfigService issueTableConfigService;
-
-    @Autowired
     private ProjectService projectService;
 
     @Autowired
@@ -77,15 +75,6 @@
 
     @Autowired
     private ApiTokenService apiTokenService;
-
-    @Autowired
-    private CompanyFieldService companyFieldService;
-
-    @Autowired
-    private IspFieldService ispFieldService;
-
-    @Autowired
-    private HostingFieldService hostingFieldService;
 
     @Autowired
     private CommonConfiguration configuration;
@@ -157,6 +146,9 @@
     private UserWorkspaceService userWorkspaceService;
 
     @Autowired
+    private WorkflowDepartmentService workflowDepartmentService;
+
+    @Autowired
     private IssueRelationService issueRelationService;
 
     @Autowired
@@ -199,6 +191,28 @@
         if (issueType == null){
             throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ISSUE_TYPE_ERROR));
         }
+
+        Workflow workflow = issueType.getWorkflow();
+
+        // �씠�뒋 �긽�깭媛� 吏��젙�릺�뼱 �엳吏� �븡�쓣 寃쎌슦 珥덇린媛믪쑝濡� 吏��젙
+        if (issueApiForm.getIssueStatusId() == null) {
+            List<IssueStatusVo> issueStatusVos = issueStatusService.findByWorkflowId(workflow.getId());
+            IssueStatusVo issueStatusVo = issueStatusVos.get(0);
+            issueApiForm.setIssueStatusId(issueStatusVo.getId());
+        }
+
+        // �썙�겕�뵆濡쒖슦 �긽�깭�뿉 �뵲瑜� �떞�떦遺��꽌 媛��졇�삤湲�
+        if (issueApiForm.getIssueStatusId() != null) {
+            WorkflowDepartmentCondition workflowDepartmentCondition = new WorkflowDepartmentCondition();
+            workflowDepartmentCondition.setIssueStatusId(issueApiForm.getIssueStatusId());
+            workflowDepartmentCondition.setWorkflowId(workflow.getId());
+            List<WorkflowDepartmentVo> workflowDepartmentVos = this.workflowDepartmentService.find(workflowDepartmentCondition);
+
+            for (WorkflowDepartmentVo workflowDepartmentVo : workflowDepartmentVos) {
+                issueForm.addDepartmentId(workflowDepartmentVo.getDepartmentVo().getId());
+            }
+        }
+
 
         // �봽濡쒖젥�듃 �엯�젰
         Project project = issueType.getProject();
@@ -341,7 +355,7 @@
         //  �떞�떦�옄 吏��젙
         //this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
         //  �떞�떦遺��꽌 吏��젙
-        this.issueDepartmentService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+        this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
         //  �뾽泥� �젙蹂� ���옣
         this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
         //  ISP �젙蹂� ���옣
@@ -568,7 +582,8 @@
         //  �씠�뒋 �븘�씠�뵒 珥덇린�솕
         issueCondition.setIssueIds(Lists.newArrayList());
         //  Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
-        this.setMapToIssueVo(results, issueVos, issueCondition);
+        User user = this.webAppUtil.getLoginUserObject();
+        this.setMapToIssueVo(results, issueVos, issueCondition, user);
 
         this.setCountDownIssues(results, issueVos);
 
@@ -582,10 +597,10 @@
     }
 
     private void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos) {
-        int downIssueCount = 0;
         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;
                 for(Issue downIssue : downIssues){
                     downIssueCount ++;
                     Long parentIssueId = downIssue.getParentIssue().getId();
@@ -707,7 +722,9 @@
 
         IssueCondition issueCondition = new IssueCondition();
         //  寃��깋 議곌굔�쓣 留뚮뱺�떎
-        if (!this.makeIssueSearchCondition(issueCondition, projectCondition, pageable)) {
+
+        User user = this.webAppUtil.getLoginUserObject();
+        if (!this.makeIssueSearchCondition(user, issueCondition, projectCondition, pageable)) {
             //  �씠�뒋 紐⑸줉�쓣 李얠� 紐삵븷 寃쎌슦 湲곕낯 �젙蹂대줈 由ы꽩�븳�떎.
             this.notFoundIssueList(resJsonData, pageable);
             return Lists.newArrayList();
@@ -751,7 +768,7 @@
     }
 
     //  Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
-    private void setMapToIssueVo(List<Map<String, Object>> results, List<IssueVo> issueVos, IssueCondition issueCondition) {
+    private void setMapToIssueVo(List<Map<String, Object>> results, List<IssueVo> issueVos, IssueCondition issueCondition, User user) {
         for (Map<String, Object> result : results) {
             IssueVo issueVo = ConvertUtil.convertMapToClass(result, IssueVo.class);
             issueVos.add(issueVo);
@@ -760,7 +777,7 @@
 
         //  �씠�뒋 �궗�슜�옄 �젙蹂� 異붽�
         //this.setIssueUserList(issueVos, issueCondition);
-        this.setIssueDepartmentList(issueVos, issueCondition);
+        this.setIssueDepartmentList(issueVos, issueCondition, user);
         //  �벑濡앹옄 �젙蹂� 異붽�
         this.setRegister(issueVos);  //  �떞�떦�옄 �젙蹂� �뀑�똿
 
@@ -807,7 +824,7 @@
     }
 
     //  寃��깋 議곌굔�쓣 留뚮뱺�떎
-    private boolean makeIssueSearchCondition(IssueCondition condition, ProjectCondition projectCondition, Pageable pageable) {
+    private boolean makeIssueSearchCondition(User user, IssueCondition condition, ProjectCondition projectCondition, Pageable pageable) {
         if (pageable != null) {
             condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
             condition.setPageSize(pageable.getPageSize());
@@ -825,7 +842,7 @@
         //  �봽濡쒖젥�듃瑜� �꽑�깮�븯吏� �븡�븯�쑝硫� �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 李몄뿬�븯怨� �엳�뒗 �봽濡쒖젥�듃瑜� 李얜뒗�떎.
         if (condition.getProjectIds().size() < 1) {
             List<Map<String, Object>> projects = null;
-            if (this.userWorkspaceService.checkWorkspaceManager()) {
+            if (this.userWorkspaceService.checkWorkspaceManager(user)) {
                 projects = this.projectMapper.findByWorkspaceManagerAll(projectCondition);
             } else  {
                 projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(projectCondition);
@@ -903,7 +920,7 @@
     }
 
     //  �씠�뒋 �떞�떦�옄 �젙蹂대�� �뀑�똿�븳�떎.
-    private void setIssueUserList(List<IssueVo> issueVos, IssueCondition issueCondition) {
+    private void setIssueUserList(List<IssueVo> issueVos, IssueCondition issueCondition, User user) {
         if (issueVos.size() < 1) {
             return;
         }
@@ -934,14 +951,14 @@
             }
 
             //  �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
-            if (this.checkHasPermission(issueVo, issueVo.getUserVos())) {
+            if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user)) {
                 issueVo.setModifyPermissionCheck(Boolean.TRUE);
             }
         }
     }
 
     //  �씠�뒋 �떞�떦遺��꽌 �젙蹂대�� �뀑�똿�븳�떎.
-    private void setIssueDepartmentList(List<IssueVo> issueVos, IssueCondition issueCondition) {
+    private void setIssueDepartmentList(List<IssueVo> issueVos, IssueCondition issueCondition, User user) {
         if (issueVos.size() < 1) {
             return;
         }
@@ -971,7 +988,7 @@
             }
 
             //  �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
-            if (this.checkHasPermission(issueVo, issueVo.getUserVos())) {
+            if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user)) {
                 issueVo.setModifyPermissionCheck(Boolean.TRUE);
             }
         }
@@ -1021,9 +1038,25 @@
     // �븯�쐞 �씠�뒋 �젙蹂대�� �뀑�똿�븳�떎
     private void setDownIssues(Issue issue, IssueVo issueVo) {
         List<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId());
+        /*if(issueVo != null && downIssues.size()>0){
+            for(Issue downIssue : downIssues){
+                IssueVo downIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
+                IssueDownVo issueDownVo = ConvertUtil.copyProperties(downIssueVo, IssueDownVo.class);
+                issueDownVo.setIssueDown(downIssueVo);
+                issueDownVo.setTitle(downIssue.getTitle());
+                issueDownVo.setIssueTypeVo(ConvertUtil.copyProperties(downIssue.getIssueType(), IssueTypeVo.class));
+                issueDownVo.setPriorityVo(ConvertUtil.copyProperties(downIssue.getPriority(), PriorityVo.class));
+                issueDownVo.setSeverityVo(ConvertUtil.copyProperties(downIssue.getSeverity(), SeverityVo.class));
+                this.setRegister(downIssue, downIssueVo); // �벑濡앹옄
+                this.setIssueDepartment(downIssue, downIssueVo);  //  �떞�떦遺��꽌 �젙蹂� �뀑�똿
+                this.setIssueCustomFields(downIssue, downIssueVo);   // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
+                issueVo.addIssueDownVo(issueDownVo);
+            }
+        }*/
+
         List<IssueVo> downIssueVos = ConvertUtil.convertObjectsToClasses(downIssues, IssueVo.class);
         List<IssueVo> resultList = new ArrayList<>();
-        if(downIssues != null && downIssueVos.size()>0){
+        if(downIssueVos != null && downIssueVos.size()>0){
             for(IssueVo downIssueVo : downIssueVos){
                 for(Issue downIssue : downIssues){
                     downIssueVo.setIssueTypeVo(ConvertUtil.copyProperties(downIssue.getIssueType(), IssueTypeVo.class));
@@ -1035,9 +1068,7 @@
                 }
                 resultList.add(downIssueVo);
             }
-            issueVo.setIssueDownVos(resultList); //�봽濡좏듃�뿉�꽌 List�삎�깭濡� 諛쏆븘以섏꽌 由ъ뒪�듃 �삎�떇�쑝濡� 蹂대궡以�
-        }else{
-            issueVo.setIssueDownVos(null);
+            issueVo.setIssueDownVos(resultList);
         }
     }
 
@@ -1225,13 +1256,42 @@
         issueVo.setIssueHistoryVos(this.issueHistoryService.findIssueHistory(issue.getId()));
     }
 
-    // �씠�뒋瑜� �닔�젙�븳�떎
+    // �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 媛숈� �씠�뒋 李얘린
     @Override
-    public Issue modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files) {
+    @Transactional
+    public List<IssueVo> findIssue(IssueApiForm issueApiform) {
+        List<IssueCustomFieldValueForm> issueCustomFieldValueForms = issueApiform.getIssueCustomFieldValues();
+        IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
+        if (issueCustomFieldValueForms != null && issueCustomFieldValueForms.size() > 0) {
+            for (IssueCustomFieldValueForm issueCustomFieldValueForm : issueCustomFieldValueForms) {
+                issueCustomFieldValueCondition.addUseValues(issueCustomFieldValueForm.getUseValue());
+            }
+        }
+        List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
+        List<IssueVo> issueVos = Lists.newArrayList();
+        if (results != null && results.size() > 0) {
+            issueVos.add(ConvertUtil.convertMapToClass(results.get(0), IssueVo.class));
+        }
+
+        return issueVos;
+    }
+
+
+    // �씠�뒋瑜� �닔�젙�븳�떎(api�슜)
+    @Override
+    @Transactional
+    public List<Issue> modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files) {
         User user = this.convertToUser(issueApiForm.getToken());
         IssueForm issueForm = this.convertToIssueForm(issueApiForm, user);
 
-        return this.modifyIssue(user, issueForm, files);
+        List<IssueVo> issueVos = this.findIssue(issueApiForm);
+        List<Issue> issue = Lists.newArrayList();
+        for (IssueVo issueVo : issueVos) {
+            issueForm.setId(issueVo.getId());
+            issue.add(this.modifyIssueForApi(user, issueForm, files));
+        }
+
+        return issue;
     }
 
     //  �씠�뒋瑜� �닔�젙�븳�떎.
@@ -1242,14 +1302,16 @@
         return modifyIssue(user, issueForm, multipartFiles);
     }
 
-    //  �씠�뒋瑜� �닔�젙�븳�떎.
-    @Override
-    @Transactional
-    public Issue modifyIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
+    // �닔�젙 �뜲�씠�꽣媛� �쑀�슚�븳吏� �솗�씤
+    private CheckIssueData checkIssue(User user, IssueForm issueForm) {
+
         //  �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
         this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
+
+        Issue issue = this.getIssue(issueForm.getId());
+        IssueStatus oldIssueStatus = issue.getIssueStatus();
         //  �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
-        this.verifyIssueModifyPermission(issueForm.getId());
+        this.verifyIssueModifyPermission(issue, user);
         //  �봽濡쒖젥�듃 �쑀�슚�꽦 泥댄겕
         Project project = this.projectService.getProject(issueForm.getProjectId());
         //  �씠�뒋 �긽�깭 �쑀�슚�꽦 泥댄겕
@@ -1270,10 +1332,83 @@
         //  �떞�떦遺��꽌 �쑀�슚�꽦 泥댄겕
         this.verifyIssueDepartment(project, issueForm);
 
-        Issue issue = this.getIssue(issueForm.getId());
+        CheckIssueData checkIssueData = new CheckIssueData();
+        checkIssueData.setIssue(issue);
+        checkIssueData.setProject(project);
+        checkIssueData.setOldIssueStatus(oldIssueStatus);
+        checkIssueData.setNewIssueStatus(issueStatus);
+        checkIssueData.setIssueType(issueType);
+        checkIssueData.setPriority(priority);
+        checkIssueData.setSeverity(severity);
+
+        return  checkIssueData;
+    }
+
+    // �씠�뒋 �닔�젙(API�슜)
+    private Issue modifyIssueForApi(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
+        CheckIssueData checkIssueData = this.checkIssue(user, issueForm);
+
+        Issue issue = checkIssueData.getIssue();
+        Project project = checkIssueData.getProject();
+        IssueType issueType = checkIssueData.getIssueType();
+        IssueStatus oldIssueStatus = checkIssueData.getOldIssueStatus();
+        IssueStatus issueStatus = checkIssueData.getNewIssueStatus();
 
         //  蹂�寃� �씠�젰 �젙蹂� 異붿텧
-        StringBuilder detectIssueChange = this.issueHistoryService.detectIssueChange(issue, issueForm, project, issueStatus, issueType, priority, severity, multipartFiles);
+        StringBuilder detectIssueChange = this.issueHistoryService.detectIssueChange(issueForm, checkIssueData, multipartFiles);
+
+        //  �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �씠�뒋 �꽆踰꾨�� �깉濡� �뵲�빞 �븳�떎.
+        this.checkChangeProject(checkIssueData.getProject(), issue);
+
+        //  �씠�뒋 �쑀�삎�씠 蹂�寃쎈릺�뿀�뒗吏� �솗�씤�븯怨� 蹂�寃쎈릺�뿀�떎硫� �씠�뒋 �긽�깭 �냽�꽦�씠 '��湲�' �씤 �씠�뒋 �긽�깭濡� 援먯껜�븳�떎.
+        if (this.checkChangeIssueType(issueType, issueStatus, issue)) {
+            issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
+            //  �씠�뒋 �긽�깭 蹂�寃� �씠�젰 �궓湲곌린 - �씠�젰�쓣 �궓湲곌린 �쐞�빐 issueForm �뿉 issueStatus Id 媛믪쓣 ���옣.
+            issueForm.setIssueStatusId(issueStatus.getId());
+            this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, oldIssueStatus, issueStatus);
+        }
+
+        issue = this.saveIssue(issueForm, checkIssueData);
+
+        //  �씠�뒋 �씠�젰 �벑濡�
+        if (!StringUtils.isEmpty(detectIssueChange.toString())) {
+            this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
+        }
+        //  �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
+        UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
+        log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_MODIFY));
+
+        return issue;
+    }
+
+    private Issue saveIssue(IssueForm issueForm, CheckIssueData checkIssueData) {
+        Issue issue = checkIssueData.getIssue();
+        ConvertUtil.copyProperties(issueForm, issue, "id");
+        issue.setProject(checkIssueData.getProject());
+        issue.setIssueStatus(checkIssueData.getNewIssueStatus());
+        issue.setIssueType(checkIssueData.getIssueType());
+        issue.setPriority(checkIssueData.getPriority());
+        issue.setSeverity(checkIssueData.getSeverity());
+        issue.setStartDate(issueForm.getStartDate());
+        issue.setCompleteDate(issueForm.getCompleteDate());
+
+        return this.issueRepository.saveAndFlush(issue);
+    }
+
+    //  �씠�뒋瑜� �닔�젙�븳�떎.
+    @Override
+    @Transactional
+    public Issue modifyIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
+        CheckIssueData checkIssueData = this.checkIssue(user, issueForm);
+
+        Issue issue = checkIssueData.getIssue();
+        IssueStatus oldIssueStatus = checkIssueData.getOldIssueStatus();
+        Project project = checkIssueData.getProject();
+        IssueStatus issueStatus = checkIssueData.getNewIssueStatus();
+        IssueType issueType = checkIssueData.getIssueType();
+
+        //  蹂�寃� �씠�젰 �젙蹂� 異붿텧
+        StringBuilder detectIssueChange = this.issueHistoryService.detectIssueChange(issueForm, checkIssueData, multipartFiles);
 
         //  �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �씠�뒋 �꽆踰꾨�� �깉濡� �뵲�빞 �븳�떎.
         this.checkChangeProject(project, issue);
@@ -1283,19 +1418,10 @@
             issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
             //  �씠�뒋 �긽�깭 蹂�寃� �씠�젰 �궓湲곌린 - �씠�젰�쓣 �궓湲곌린 �쐞�빐 issueForm �뿉 issueStatus Id 媛믪쓣 ���옣.
             issueForm.setIssueStatusId(issueStatus.getId());
-            this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, issueStatus);
+            this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, oldIssueStatus, issueStatus);
         }
 
-        ConvertUtil.copyProperties(issueForm, issue, "id");
-        issue.setProject(project);
-        issue.setIssueStatus(issueStatus);
-        issue.setIssueType(issueType);
-        issue.setPriority(priority);
-        issue.setSeverity(severity);
-        issue.setStartDate(issueForm.getStartDate());
-        issue.setCompleteDate(issueForm.getCompleteDate());
-
-        this.issueRepository.saveAndFlush(issue);
+        issue = this.saveIssue(issueForm, checkIssueData);
         //this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
         //  �떞�떦遺��꽌 吏��젙
         if(issueForm.getDepartmentIds().size()>0){
@@ -1318,7 +1444,8 @@
             this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
         }
         //  �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
-        log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_MODIFY));
+        UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
+        log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_MODIFY));
 
         //  �뾽泥� �젙蹂� ���옣
         this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
@@ -1440,11 +1567,9 @@
     }
 
     //  �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
-    private void verifyIssueModifyPermission(Long issueId) {
-        Issue issue = this.getIssue(issueId);
-
+    private void verifyIssueModifyPermission(Issue issue, User user) {
         //  �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
-        if (!this.checkHasPermission(ConvertUtil.copyProperties(issue, IssueVo.class), this.getIssueUserVos(issue))) {
+        if (!this.checkHasPermission(ConvertUtil.copyProperties(issue, IssueVo.class), this.getIssueUserVos(issue), user)) {
             throw new OwlRuntimeException(
                     this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_MODIFY_PERMISSION));
         }
@@ -1454,24 +1579,31 @@
     private List<UserVo> getIssueUserVos(Issue issue) {
         List<UserVo> userVos = Lists.newArrayList();
 
-        for (IssueUser issueUser : issue.getIssueUsers()) {
-            UserVo userVo = ConvertUtil.copyProperties(issueUser.getUser(), UserVo.class, "password");
-            userVos.add(userVo);
+        Set<IssueUser> issueUsers = issue.getIssueUsers();
+
+        try {
+            for (IssueUser issueUser : issueUsers) {
+                User user = issueUser.getUser();
+                UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password");
+                userVos.add(userVo);
+            }
+        } catch (Exception ex) {
+
         }
 
         return userVos;
     }
 
     //  �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
-    private boolean checkHasPermission(IssueVo issueVo, List<UserVo> issueUserVos) {
+    private boolean checkHasPermission(IssueVo issueVo, List<UserVo> issueUserVos, User user) {
         boolean hasPermission = false;
 
         //  �뾽臾� 怨듦컙 愿�由ъ옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
-        hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.WORKSPACE_MANAGER, issueVo, null, null);
+        hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.WORKSPACE_MANAGER, issueVo, null, null, user);
         //  �봽濡쒖젥�듃 愿�由ъ옄�씪 寃쎌슦 �빐�떦 �봽濡쒖젥�듃�뿉 �벑濡앸맂 �씠�뒋�뒗 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
-        hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null, null);
+        hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null, null, user);
         //   �씠�뒋 �벑濡앹옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
-        hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null, null);
+        hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null, null, user);
         //  �씠�뒋 �떞�떦�옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎. => �떞�떦遺��꽌濡� �닔�젙 - 泥댄겕
         //hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ASSIGNEE, issueVo, issueUserVos);
         //  �떞�떦�옄媛� �뾾�쑝硫� 紐⑤뱺 �궗�슜�옄媛� �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
@@ -1480,22 +1612,22 @@
     }
 
     //  �씠�뒋 �닔�젙 沅뚰븳�쓣 �솗�씤�븳�떎.
-    private boolean checkIssueModifyPermission(Boolean hasPermission, String checkType, IssueVo issueVo, List<UserVo> issueUserVos, List<DepartmentVo> issueDepartmentVos) {
+    private boolean checkIssueModifyPermission(Boolean hasPermission, String checkType, IssueVo issueVo, List<UserVo> issueUserVos, List<DepartmentVo> issueDepartmentVos, User user) {
         if (!hasPermission) {
             switch (checkType) {
                 case Issue.WORKSPACE_MANAGER:  //  �뾽臾� 怨듦컙 愿�由ъ옄
                     //  �뾽臾� 怨듦컙 愿�由ъ옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
-                    hasPermission = this.userWorkspaceService.checkWorkspaceManager();
+                    hasPermission = this.userWorkspaceService.checkWorkspaceManager(user);
                     break;
 
                 case Issue.PROJECT_MANAGER:    //  �봽濡쒖젥�듃 愿�由ъ옄
                     Issue issue = this.getIssue(issueVo.getId());
                     //  �봽濡쒖젥�듃 愿�由ъ옄�씪 寃쎌슦 �빐�떦 �봽濡쒖젥�듃�뿉 �벑濡앸맂 �씠�뒋�뒗 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
-                    hasPermission = this.projectRoleUserService.checkProjectManager(issue.getProject());
+                    hasPermission = this.projectRoleUserService.checkProjectManager(issue.getProject(), user);
                     break;
 
                 case Issue.REGISTER:   //  �씠�뒋 �벑濡앹옄
-                    hasPermission = issueVo.getRegisterId().equals(this.webAppUtil.getLoginId());
+                    hasPermission = issueVo.getRegisterId().equals(user.getId());
                     break;
 
                 case Issue.ASSIGNEE:
@@ -1506,7 +1638,7 @@
                     }
                     //   �씠�뒋 �떞�떦�옄 �뿬遺� �솗�씤
                     for (UserVo issueUserVo : issueUserVos) {
-                        if (issueUserVo.getId().equals(this.webAppUtil.getLoginId())) {
+                        if (issueUserVo.getId().equals(user.getId())) {
                             hasPermission = true;
                             break;
                         }
@@ -1536,20 +1668,22 @@
     //  �씠�뒋 �긽�깭 蹂�寃�
     @Override
     @Transactional
-    public void modifyIssueStatus(IssueForm issueForm) {
+    public void modifyIssueStatus(IssueForm issueForm, User user) {
         //  �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
         this.workspaceService.checkUseWorkspace();
         //  蹂�寃� �씠�젰 �젙蹂� 異붿텧
         StringBuilder detectIssueChange = new StringBuilder();
         //  �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
-        this.verifyIssueModifyPermission(issueForm.getId());
         Issue issue = this.getIssue(issueForm.getId());
+        IssueStatus oldIssueStatus = issue.getIssueStatus();
+
+        this.verifyIssueModifyPermission(issue, user);
 
         IssueStatus issueStatus = this.issueStatusService.getIssueStatus(issueForm.getIssueStatusId());
         //  �씠�뒋 �긽�깭瑜� 蹂�寃쏀븷 �븣 �꽑�깮�븳 �씠�뒋 �긽�깭濡� 蹂�寃쏀븷 �닔 �엳�뒗吏� �솗�씤�븳�떎.
         this.issueStatusService.checkNextIssueStatus(issue, issueStatus);
         //  蹂�寃� �씠�젰 �젙蹂� 異붿텧
-        this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, issueStatus);
+        this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, oldIssueStatus, issueStatus);
 
         issue.setIssueStatus(issueStatus);
         this.issueRepository.saveAndFlush(issue);
@@ -1583,13 +1717,15 @@
     @Override
     @Transactional
     public void modifyIssueUser(IssueForm issueForm) {
+        User user = this.webAppUtil.getLoginUserObject();
+
         //  �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
         this.workspaceService.checkUseWorkspace();
         //  蹂�寃� �씠�젰 �젙蹂� 異붿텧
         StringBuilder detectIssueChange = new StringBuilder();
         //  �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
-        this.verifyIssueModifyPermission(issueForm.getId());
         Issue issue = this.getIssue(issueForm.getId());
+        this.verifyIssueModifyPermission(issue, user);
         issue.setProject(this.projectService.getProject(issueForm.getProjectId()));
 
         //  蹂�寃� �씠�젰 �젙蹂� 異붿텧
@@ -1618,13 +1754,14 @@
     @Override
     @Transactional
     public void modifyIssueDepartment(IssueForm issueForm) {
+        User user = this.webAppUtil.getLoginUserObject();
         //  �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
         this.workspaceService.checkUseWorkspace();
         //  蹂�寃� �씠�젰 �젙蹂� 異붿텧
         StringBuilder detectIssueChange = new StringBuilder();
         //  �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
-        this.verifyIssueModifyPermission(issueForm.getId());
         Issue issue = this.getIssue(issueForm.getId());
+        this.verifyIssueModifyPermission(issue, user);
         issue.setProject(this.projectService.getProject(issueForm.getProjectId()));
 
         //  蹂�寃� �씠�젰 �젙蹂� 異붿텧
@@ -1656,6 +1793,7 @@
     @Transactional
     public void removeIssues(IssueForm issueForm) {
         //  �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
+        User user = this.webAppUtil.getLoginUserObject();
         this.workspaceService.checkUseWorkspace();
 
         if (issueForm.getRemoveIds().size() < 1) {
@@ -1666,7 +1804,7 @@
         List<Issue> removeIssues = Lists.newArrayList();
 
         for (Long issueId : issueForm.getRemoveIds()) {
-            Issue issue = this.issueRemoves(issueId);
+            Issue issue = this.issueRemoves(issueId, user);
             removeIssues.add(issue);
         }
 
@@ -1678,10 +1816,10 @@
         log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_REMOVE));
     }
 
-    private Issue issueRemoves(Long issueId) {
+    private Issue issueRemoves(Long issueId, User user) {
         Issue issue = this.getIssue(issueId);
         //  �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
-        this.verifyIssueModifyPermission(issueId);
+        this.verifyIssueModifyPermission(issue, user);
 
         //  �씠�뒋 泥⑤� �뙆�씪�쓣 �궘�젣�븳�떎.
         if (issue.getAttachedFiles().size() > 0) {
@@ -1845,7 +1983,8 @@
         issueCondition.setIssueIds(Lists.newArrayList());
 
         //  Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
-        this.setMapToIssueVo(results, issueVos, issueCondition);
+        User user = this.webAppUtil.getLoginUserObject();
+        this.setMapToIssueVo(results, issueVos, issueCondition, user);
 
         //  IssueVos �뜲�씠�꽣瑜� �뿊���뿉�꽌 �몴�떆�븷 �닔 �엳�뒗 �뜲�씠�꽣濡� 蹂�寃쏀븳�떎.
         List<Map<String, String>> convertExcelViewToIssueMaps = this.convertExcelViewToIssueVos(issueVos);
@@ -2013,10 +2152,12 @@
         //  �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
         this.workspaceService.checkUseWorkspace();
 
+        User user = this.webAppUtil.getLoginUserObject();
+
         for (Long issueId : issueForm.getIds()) {
             issueForm.setId(issueId);
             //  �씠�뒋 �긽�깭 蹂�寃�
-            this.modifyIssueStatus(issueForm);
+            this.modifyIssueStatus(issueForm, user);
         }
 
         // �떞�떦 遺��꽌 �닔�젙
@@ -2942,7 +3083,7 @@
         StringBuilder sb = new StringBuilder();
 
         Issue parentIssue = issue.getParentIssue(); //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
-        if(parentIssue != null){ //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋媛� 議댁옱 �븷 寃쎌슦
+        if(parentIssue != null && parentIssue.getId().equals(newParentIssueId)){ //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋媛� 議댁옱 �븷 寃쎌슦
             this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
             this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());
         }
@@ -2951,7 +3092,7 @@
             parentIssue = this.getIssue(newParentIssueId); //�긽�쐞�씠�뒋(myIssue)
             issue.setParentIssue(parentIssue); //myIssue瑜� �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋濡� set
             this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = �븯�쐞�씠�뒋
-        } else  {
+        } else{
             // �궘�젣 �븷 寃쎌슦
             this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
             issue.setParentIssue(null);

--
Gitblit v1.8.0