From 58e7c16d504fe4b6bd5453307ace58e185537d64 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 13:54:09 +0900
Subject: [PATCH] - 이슈 추가,수정 시 이력 남기는 부분 코드 수정

---
 src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 8e9c31b..e97dba6 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
@@ -71,13 +71,14 @@
 
         // �궗�슜�옄媛� 吏곸젒 �엯�젰 �떆 COMPANY 紐⑸줉�뿉 異붽�
         if (newIssueCompany.getCompanyField() == null) {
-            companyField = this.companyFieldService.addCompany(companyFieldForm);
-            newIssueCompany.setCompanyField(companyField);
             IssueCompany oldIssueCompany = this.issueCompanyRepository.findByIssueId(issue.getId());
+            companyField = this.companyFieldService.addCompany(companyFieldForm);
+            companyFieldForm.setId(companyField.getId());
             if (oldIssueCompany != null) {
                 issueHistoryService.detectIssueCompany(IssueHistoryType.MODIFY, null, companyFieldForm, oldIssueCompany, sb);
                 this.issueCompanyRepository.deleteById(oldIssueCompany.getId());
             } else {
+                newIssueCompany.setCompanyField(companyField);
                 issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, null, companyFieldForm, newIssueCompany, sb);
             }
         }

--
Gitblit v1.8.0