From 491455286747cb100caee9ca12d9b5a94077b85e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 18 1월 2022 10:07:11 +0900
Subject: [PATCH] 이슈 추가/수정 시 ISP, 호스팅 이름 못 불러오는 문제 해결 (custom-input)
---
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 d1a24e2..955cb24 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -119,12 +119,10 @@
public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
if (issue != null) {
StringBuilder sb = new StringBuilder();
+ IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
if (issueIspFields != null && issueIspFields.size() > 0) {
Map<String, Object> param = issueIspFields.get(0);
-
- if (issueIspFields != null && issueIspFields.size() > 0) {
- IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
if (issueIsp != null) {//�닔�젙 �떆
// 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
@@ -148,14 +146,18 @@
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();
+
+ if (issueIsp != null) {
+ issueHistoryService.detectIssueIsp(IssueHistoryType.DELETE, null, null, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
}
}
--
Gitblit v1.8.0