From 5d86919587d0f76f26be550c1023628a9d0caa5d Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 20 12월 2021 17:38:28 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
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 9437299..8bd2b6c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -49,11 +49,11 @@
if (issueIspFields != null && issueIspFields.size() > 0) {
Map<String, Object> param = issueIspFields.get(0);
- if (param != null) {
+ if (param != null && param.get("hostingId") != null && param.get("hostingId") != "") {
HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId"));
Set<IssueHosting> issueHostings = issue.getIssueHostingFields();
- IssueHosting issueHosting = null;
+ IssueHosting issueHosting = new IssueHosting();
if (issueHostings != null && issueHostings.size() >0){//�닔�젙 �븷 寃쎌슦
issueHosting = issueHostings.iterator().next();
@@ -66,19 +66,24 @@
issueHosting.setName(MapUtil.getString(param, "name"));
issueHosting.setEmail(MapUtil.getString(param, "email"));
issueHosting.setCode(MapUtil.getString(param, "code"));
+ issueHosting.setUrl(MapUtil.getString(param, "url"));
issueHosting.setManager(MapUtil.getString(param, "manager"));
issueHosting.setTel(MapUtil.getString(param, "tel"));
issueHosting.setMemo(MapUtil.getString(param, "memo"));
}else{//異붽� �븷 寃쎌슦
issueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
issueHosting.setIssue(issue);
- issueHosting.setHostingField(hostingField);
+ if (hostingField != null) {
+ issueHosting.setHostingField(hostingField);
+ }
// 異붽� �씠�젰
StringBuilder sb = new StringBuilder();
issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, issueHosting, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
this.issueHostingRepository.saveAndFlush(issueHosting);
+ }else {
+ this.issueHostingRepository.deleteById(MapUtil.getLong(param, "id"));
}
}
}
--
Gitblit v1.8.0