From b5c8b90fac9634a581ffc1deb1460630f09638ba Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 10 12월 2021 13:53:37 +0900
Subject: [PATCH] 이슈삭제 오류 해결

---
 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java |   53 ++++++++++++++++++++++++++---------------------------
 1 files changed, 26 insertions(+), 27 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 7300590..21fc7e7 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -2163,39 +2163,38 @@
     }
 
     private Issue issueRemoves(Long issueId, User user) {
-        Issue issue = null;
-        if(issueId != null){
-            issue = this.getIssue(issueId);
-        }
-        //  �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
-        this.verifyIssueModifyPermission(issue, user);
+        Issue issue = this.findOne(issueId);
+        if(issue != null){
+            //  �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
+            this.verifyIssueModifyPermission(issue, user);
 
-        //  �씠�뒋 泥⑤� �뙆�씪�쓣 �궘�젣�븳�떎.
-        if (issue.getAttachedFiles().size() > 0) {
-            List<Long> attachedFileIds = Lists.newArrayList();
+            //  �씠�뒋 泥⑤� �뙆�씪�쓣 �궘�젣�븳�떎.
+            if (issue.getAttachedFiles().size() > 0) {
+                List<Long> attachedFileIds = Lists.newArrayList();
 
-            for (AttachedFile attachedFile : issue.getAttachedFiles()) {
-                attachedFileIds.add(attachedFile.getId());
+                for (AttachedFile attachedFile : issue.getAttachedFiles()) {
+                    attachedFileIds.add(attachedFile.getId());
+                }
+                //  泥⑤��뙆�씪 �궘�젣
+                this.attachedFileService.removeAttachedFiles(attachedFileIds);
             }
-            //  泥⑤��뙆�씪 �궘�젣
-            this.attachedFileService.removeAttachedFiles(attachedFileIds);
-        }
 
-        // 吏��슱 �씠�뒋媛� �뿰愿��씠�뒋�씤吏� 泥댄겕 �썑 �뿰愿��씠�뒋 �뀒�씠釉붿뿉�꽌�룄 �궘�젣�븳�떎.
-        List<IssueRelation> issueRelationList = this.issueRelationRepository.findByRelationIssueId(issueId);
-        if (issueRelationList != null && issueRelationList.size() > 0) {
-            for(IssueRelation issueRelation : issueRelationList){
-                StringBuilder sb = new StringBuilder();
-                issueHistoryService.detectRelationIssue(IssueHistoryType.DELETE, issueRelation, sb);
-                issueHistoryService.addIssueHistory(issueRelation.getIssue(), IssueHistoryType.MODIFY, sb.toString());
-                this.issueRelationRepository.delete(issueRelation);
+            // 吏��슱 �씠�뒋媛� �뿰愿��씠�뒋�씤吏� 泥댄겕 �썑 �뿰愿��씠�뒋 �뀒�씠釉붿뿉�꽌�룄 �궘�젣�븳�떎.
+            List<IssueRelation> issueRelationList = this.issueRelationRepository.findByRelationIssueId(issueId);
+            if (issueRelationList != null && issueRelationList.size() > 0) {
+                for(IssueRelation issueRelation : issueRelationList){
+                    StringBuilder sb = new StringBuilder();
+                    issueHistoryService.detectRelationIssue(IssueHistoryType.DELETE, issueRelation, sb);
+                    issueHistoryService.addIssueHistory(issueRelation.getIssue(), IssueHistoryType.MODIFY, sb.toString());
+                    this.issueRelationRepository.delete(issueRelation);
+                }
             }
-        }
 
-        //  �씠�뒋 �깮�꽦, �궘�젣�떆 �삁�빟 �씠硫붿씪�뿉 �벑濡앺빐�넃�뒗�떎.
-        this.reservationIssueEmail(issue, EmailType.ISSUE_REMOVE);
-        //  �씠�뒋 �궘�젣
-        this.issueRepository.delete(issue);
+            //  �씠�뒋 �깮�꽦, �궘�젣�떆 �삁�빟 �씠硫붿씪�뿉 �벑濡앺빐�넃�뒗�떎.
+            this.reservationIssueEmail(issue, EmailType.ISSUE_REMOVE);
+            //  �씠�뒋 �궘�젣
+            this.issueRepository.delete(issue);
+        }
 
         return issue;
     }

--
Gitblit v1.8.0