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/IssueHostingServiceImpl.java |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
index be17a29..932da15 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -52,8 +52,7 @@
      * @param issueForm IssueForm
      * @param issue Issue
      */
-    private void CreateHostingField(IssueForm issueForm, Issue issue) {
-        StringBuilder sb = new StringBuilder();
+    private void CreateHostingField(IssueForm issueForm, Issue issue, StringBuilder sb) {
         // issueHosting �븘�뱶 �뤌 留뚮뱾湲�
         HostingFieldForm hostingFieldForm = new HostingFieldForm();
         hostingFieldForm.setName(issueForm.getHostingName());
@@ -80,8 +79,6 @@
                 issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingFieldForm, newIssueHosting, sb);
             }
         }
-        // 異붽� �씠�젰
-        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
         this.issueHostingRepository.saveAndFlush(newIssueHosting);
     }
 
@@ -117,20 +114,17 @@
     //  �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
     @Override
     @Transactional
-    public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
+    public void modifyIssueHostingField(Issue issue, IssueForm issueForm, StringBuilder sb) {
         if (issue != null) {
-            StringBuilder sb = new StringBuilder();
+            IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
             List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
-
             if (issueHostingFields != null && issueHostingFields.size() > 0) {
                 Map<String, Object> param = issueHostingFields.get(0);
-                IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
 
                 if (issueHosting != null) { //�닔�젙 �떆
                     // 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set �빐二쇨린
                     issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
-                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
-                    
+
                     issueHosting.setName(MapUtil.getString(param, "name"));
                     issueHosting.setEmail(MapUtil.getString(param, "email"));
                     issueHosting.setCode(MapUtil.getString(param, "code"));
@@ -138,23 +132,28 @@
                     issueHosting.setManager(MapUtil.getString(param, "manager"));
                     issueHosting.setTel(MapUtil.getString(param, "tel"));
                     issueHosting.setMemo(MapUtil.getString(param, "memo"));
-                    
+
                     this.issueHostingRepository.saveAndFlush(issueHosting);
 
                 } else { //異붽� �떆
                     IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
                     // 異붽� �씠�젰
                     issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
-                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                     this.issueHostingRepository.saveAndFlush(newIssueHosting);
                 }
-            } else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
+
+            }else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
                 // �샇�뒪�똿 �젙蹂� 吏곸젒 異붽�
-                CreateHostingField(issueForm, issue);
+                CreateHostingField(issueForm, issue, sb);
             } else {
                 this.issueHostingRepository.deleteByIssueId(issue.getId());
                 this.issueHostingRepository.flush();
+
+                if (issueHosting != null) {
+                    issueHistoryService.detectIssueHosting(IssueHistoryType.DELETE, null, null, issueHosting, sb);
+                }
             }
+            //issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
         }
     }
 

--
Gitblit v1.8.0