From 0f8808a8297cbe1c4de9e42e6082bc94d46e41fb Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 18 11월 2021 21:50:00 +0900
Subject: [PATCH] 이슈 수정 - 중복코드 제거

---
 src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
index 4b16e2c..4befbb1 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
@@ -47,24 +47,21 @@
                     CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId"));
 
                     Set<IssueCompany> issueCompanies = issue.getIssueCompanies();
+                    IssueCompany issueCompany = null;
                     if (issueCompanies != null && issueCompanies.size() > 0) {
-                        IssueCompany issueCompany = issueCompanies.iterator().next();
+                        issueCompany = issueCompanies.iterator().next();
                         issueCompany.setCompanyField(companyField);
                         issueCompany.setName(MapUtil.getString(param, "name"));
                         issueCompany.setEmail(MapUtil.getString(param, "email"));
                         issueCompany.setManager(MapUtil.getString(param, "manager"));
                         issueCompany.setTel(MapUtil.getString(param, "tel"));
                         issueCompany.setMemo(MapUtil.getString(param, "memo"));
-
-                        this.issueCompanyRepository.saveAndFlush(issueCompany);
-
                     } else  {
-                        IssueCompany newIssueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
-                        newIssueCompany.setIssue(issue);
-                        newIssueCompany.setCompanyField(companyField);
-
-                        this.issueCompanyRepository.saveAndFlush(newIssueCompany);
+                        issueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
+                        issueCompany.setIssue(issue);
+                        issueCompany.setCompanyField(companyField);
                     }
+                    this.issueCompanyRepository.saveAndFlush(issueCompany);
                 }
             }
         }

--
Gitblit v1.8.0