From 261950c3d8e20fb94141c03b37a2872f75477831 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 21:07:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
index 80b12e2..8753a2e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -349,8 +349,11 @@
this.detectIssuePeriod(issue, issueForm, description);
// �떞�떦�옄 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
this.detectIssueManager(issue, issueForm, description);
- // �떞�떦遺��꽌 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
- this.detectIssueDepartment(issue, issueForm, description);
+
+ if (issueForm.getIsApi().equals(Issue.IS_API_NO)) { //api濡� 蹂�寃� �떆 �떞�떦遺��꽌 蹂�寃� 遺덇�
+ // �떞�떦遺��꽌 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
+ this.detectIssueDepartment(issue, issueForm, description);
+ }
// �궗�슜�옄 �젙�쓽 �븘�뱶 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
this.detectCustomField(issue, issueForm, description);
@@ -598,7 +601,7 @@
public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IspField ispField, IssueIsp issueIsp, StringBuilder description) {
Long id = 0L;
if (param != null) {
- id = MapUtil.getLong(param, "companyId");
+ id = MapUtil.getLong(param, "ispId");
} else if(ispField != null) {
id = ispField.getId();
}
@@ -639,7 +642,7 @@
public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, HostingField hostingField, IssueHosting issueHosting, StringBuilder description) {
Long id = 0L;
if (param != null) {
- id = MapUtil.getLong(param, "companyId");
+ id = MapUtil.getLong(param, "hostingId");
}else if(hostingField != null) {
id = hostingField.getId();
}
@@ -759,10 +762,7 @@
// �씠�뒋 �쐞�뿕 愿�由ъ뿉 �떞�떦遺��꽌 蹂�寃� �젙蹂대�� �뾽�뜲�씠�듃 �븳�떎. - �떞�떦遺��꽌 蹂�寃�
this.issueRiskService.modifyIssueRisk(issue, false, true, null);
saveIssueRisk = true;
- }
-
- // �떞�떦遺��꽌 �닔�뒗 媛숈쑝�굹 �떞�떦遺��꽌媛� �떖�씪議뚯쓣 寃쎌슦
- if (issue.getIssueDepartments().size() > 0 && issueForm.getDepartmentIds().size() > 0) {
+ }else if (issue.getIssueDepartments().size() > 0 && issueForm.getDepartmentIds().size() > 0) {// �떞�떦遺��꽌 �닔�뒗 媛숈쑝�굹 �떞�떦遺��꽌媛� �떖�씪議뚯쓣 寃쎌슦
// �씠�쟾 �떞�떦�옄 �몴�떆
for (IssueDepartment issueDepartment : issue.getIssueDepartments()) {
boolean change = true;
--
Gitblit v1.8.0