From dea4bb128425e06684bf95e8e97613a20cf3bcfa Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 24 1월 2022 18:10:31 +0900
Subject: [PATCH] 이슈 테이블 표시 설정 10 이상 정렬 오류 해결

---
 src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
index af71f52..4bf324b 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -49,7 +49,7 @@
      * @param issueForm IssueForm
      * @param issue Issue
      */
-    private void CreateIspField(IssueForm issueForm, Issue issue) {
+    private void CreateIspField(IssueForm issueForm, Issue issue, StringBuilder sb) {
         // issueIsp �븘�뱶 �뤌 留뚮뱾湲�
         IspFieldForm ispFieldForm = new IspFieldForm();
         ispFieldForm.setName(issueForm.getIspName());
@@ -62,22 +62,20 @@
 
         IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue);
         IspField ispField = new IspField();
-        StringBuilder sb = new StringBuilder();
 
         // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 ISP 紐⑸줉�뿉 異붽�
         if (newIssueIsp.getIspField() == null) {
-            ispField = this.ispFieldService.add(ispFieldForm);
-            newIssueIsp.setIspField(ispField);
             IssueIsp oldIssueIsp = this.issueIspRepository.findByIssueId(issue.getId());
+            ispField = this.ispFieldService.add(ispFieldForm);
+            ispFieldForm.setId(ispField.getId());
             if (oldIssueIsp != null) {
                 issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, null, ispFieldForm, oldIssueIsp, sb);
                 this.issueIspRepository.deleteById(oldIssueIsp.getId());
             } else {
+                newIssueIsp.setIspField(ispField);
                 issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, null, ispFieldForm, newIssueIsp, sb);
             }
         }
-        // 異붽� �씠�젰
-        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
         this.issueIspRepository.saveAndFlush(newIssueIsp);
     }
 
@@ -94,8 +92,10 @@
             IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());
             issueIsp.setIspField(ispField);
         }
+
         return issueIsp;
     }
+
 
     /**
      *  �씠�뒋 ISP 留뚮뱾湲�
@@ -109,23 +109,22 @@
         return CreateIssueIsp(ispFieldForm, issue);
     }
 
+
     //  �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
     @Override
     @Transactional
-    public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
+    public void modifyIssueIspField(Issue issue, IssueForm issueForm, StringBuilder sb) {
         if (issue != null) {
-            StringBuilder sb = new StringBuilder();
+            IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
             List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
 
             if (issueIspFields != null && issueIspFields.size() > 0) {
                 Map<String, Object> param = issueIspFields.get(0);
-                IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
 
                 if (issueIsp != null) {//�닔�젙 �떆
                     // 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
                     issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
-                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
-                    
+
                     issueIsp.setName(MapUtil.getString(param, "name"));
                     issueIsp.setEmail(MapUtil.getString(param, "email"));
                     issueIsp.setCode(MapUtil.getString(param, "code"));
@@ -140,18 +139,21 @@
                     IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
                     // 異붽� �씠�젰
                     issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
-                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                     this.issueIspRepository.saveAndFlush(newIssueIsp);
                 }
-            }
-            // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆
-            else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
+
+            } else if (issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
                 //ISP�젙蹂� 吏곸젒 異붽�
-                CreateIspField(issueForm, issue);
+                CreateIspField(issueForm, issue, sb);
             } else {
                 this.issueIspRepository.deleteByIssueId(issue.getId());
                 this.issueIspRepository.flush();
+
+                if (issueIsp != null) {
+                    issueHistoryService.detectIssueIsp(IssueHistoryType.DELETE, null, null, issueIsp, sb);
+                }
             }
+            //issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
         }
     }
 

--
Gitblit v1.8.0