From 709c9fb1f42a70da66ab9b759014b009b1c67d95 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 14:03:30 +0900
Subject: [PATCH] 충돌 병합

---
 src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java |   63 +++++++++++++++++--------------
 1 files changed, 34 insertions(+), 29 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 b354bce..d1a24e2 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -95,8 +95,10 @@
             IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());
             issueIsp.setIspField(ispField);
         }
+
         return issueIsp;
     }
+
 
     /**
      *  �씠�뒋 ISP 留뚮뱾湲�
@@ -110,6 +112,7 @@
         return CreateIssueIsp(ispFieldForm, issue);
     }
 
+
     //  �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
     @Override
     @Transactional
@@ -117,41 +120,43 @@
         if (issue != null) {
             StringBuilder sb = new StringBuilder();
             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"));
-                    issueIsp.setUrl(MapUtil.getString(param, "url"));
-                    issueIsp.setManager(MapUtil.getString(param, "manager"));
-                    issueIsp.setTel(MapUtil.getString(param, "tel"));
-                    issueIsp.setMemo(MapUtil.getString(param, "memo"));
+                if (issueIspFields != null && issueIspFields.size() > 0) {
+                    IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
 
-                    this.issueIspRepository.saveAndFlush(issueIsp);
+                    if (issueIsp != null) {//�닔�젙 �떆
+                        // 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
+                        issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
+                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
 
-                } else { //異붽� �떆
-                    IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
-                    // 異붽� �씠�젰
-                    issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
-                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
-                    this.issueIspRepository.saveAndFlush(newIssueIsp);
+                        issueIsp.setName(MapUtil.getString(param, "name"));
+                        issueIsp.setEmail(MapUtil.getString(param, "email"));
+                        issueIsp.setCode(MapUtil.getString(param, "code"));
+                        issueIsp.setUrl(MapUtil.getString(param, "url"));
+                        issueIsp.setManager(MapUtil.getString(param, "manager"));
+                        issueIsp.setTel(MapUtil.getString(param, "tel"));
+                        issueIsp.setMemo(MapUtil.getString(param, "memo"));
+
+                        this.issueIspRepository.saveAndFlush(issueIsp);
+
+                    } else { //異붽� �떆
+                        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("")) {
-                //ISP�젙蹂� 吏곸젒 異붽�
-                CreateIspField(issueForm, issue);
-            } else {
-                this.issueIspRepository.deleteByIssueId(issue.getId());
-                this.issueIspRepository.flush();
+                // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆
+                else if (issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
+                    //ISP�젙蹂� 吏곸젒 異붽�
+                    CreateIspField(issueForm, issue);
+                } else {
+                    this.issueIspRepository.deleteByIssueId(issue.getId());
+                    this.issueIspRepository.flush();
+                }
             }
         }
     }

--
Gitblit v1.8.0