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 +++--
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java | 5 +++--
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 5 +++--
3 files changed, 9 insertions(+), 6 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);
}
}
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 21f5d4c..be17a29 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -69,13 +69,14 @@
// �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 �샇�뒪�똿 紐⑸줉�뿉 異붽�
if (newIssueHosting.getHostingField() == null) {
- hostingField = this.hostingFieldService.add(hostingFieldForm);
- newIssueHosting.setHostingField(hostingField);
IssueHosting oldIssueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
+ hostingField = this.hostingFieldService.add(hostingFieldForm);
+ hostingFieldForm.setId(hostingField.getId());
if (oldIssueHosting != null) {
this.issueHostingRepository.deleteById(oldIssueHosting.getId());
issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, null, hostingFieldForm, oldIssueHosting, sb);
} else {
+ newIssueHosting.setHostingField(hostingField);
issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingFieldForm, newIssueHosting, sb);
}
}
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..b354bce 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -66,13 +66,14 @@
// �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 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);
}
}
--
Gitblit v1.8.0