From 00b7d9049132b23712a342c92fc8d300439df946 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 17 1월 2022 09:56:33 +0900
Subject: [PATCH] - isp / hosting 값이 없을 경우 예외처리 추가
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 82 +++++++++++++++++++++--------------------
1 files changed, 42 insertions(+), 40 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 5e55c83..c5443b0 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -82,55 +82,57 @@
public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
if (issue != null) {
List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
- Map<String, Object> param = issueHostingFields.get(0);
-
if (issueHostingFields != null && issueHostingFields.size() > 0) {
- IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
+ Map<String, Object> param = issueHostingFields.get(0);
- if (issueHosting != null) { //�닔�젙 �떆
- 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"));
- // 蹂�寃� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- this.issueHostingRepository.saveAndFlush(issueHosting);
+ if (issueHostingFields != null && issueHostingFields.size() > 0) {
+ IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
- } else { //異붽� �떆
- IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
+ if (issueHosting != null) { //�닔�젙 �떆
+ 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"));
+ // 蹂�寃� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueHostingRepository.saveAndFlush(issueHosting);
+
+ } else { //異붽� �떆
+ IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueHostingRepository.saveAndFlush(newIssueHosting);
+ }
+ } else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
+ // issueHosting �븘�뱶 �뤌 留뚮뱾湲�
+ HostingFieldForm hostingFieldForm = new HostingFieldForm();
+ hostingFieldForm.setName(issueForm.getHostingName());
+ hostingFieldForm.setCode(issueForm.getHostingCode());
+ hostingFieldForm.setEmail(issueForm.getHostingEmail());
+ hostingFieldForm.setUrl(issueForm.getHostingUrl());
+ hostingFieldForm.setManager(issueForm.getHostingManager());
+ hostingFieldForm.setTel(issueForm.getHostingTel());
+ hostingFieldForm.setMemo(issueForm.getHostingMemo());
+
+ IssueHosting newIssueHosting = CreateIssueHosting(hostingFieldForm, issue);
+ HostingField hostingField = new HostingField();
+ if (newIssueHosting.getHostingField() == null) { // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 �샇�뒪�똿 紐⑸줉�뿉 異붽�
+ hostingField = this.hostingFieldService.add(hostingFieldForm);
+ newIssueHosting.setHostingField(hostingField);
+ }
// 異붽� �씠�젰
StringBuilder sb = new StringBuilder();
issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
this.issueHostingRepository.saveAndFlush(newIssueHosting);
}
- } else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
- // issueHosting �븘�뱶 �뤌 留뚮뱾湲�
- HostingFieldForm hostingFieldForm = new HostingFieldForm();
- hostingFieldForm.setName(issueForm.getHostingName());
- hostingFieldForm.setCode(issueForm.getHostingCode());
- hostingFieldForm.setEmail(issueForm.getHostingEmail());
- hostingFieldForm.setUrl(issueForm.getHostingUrl());
- hostingFieldForm.setManager(issueForm.getHostingManager());
- hostingFieldForm.setTel(issueForm.getHostingTel());
- hostingFieldForm.setMemo(issueForm.getHostingMemo());
-
- IssueHosting newIssueHosting = CreateIssueHosting(hostingFieldForm, issue);
- HostingField hostingField = new HostingField();
- if (newIssueHosting.getHostingField() == null) { // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 �샇�뒪�똿 紐⑸줉�뿉 異붽�
- hostingField = this.hostingFieldService.add(hostingFieldForm);
- newIssueHosting.setHostingField(hostingField);
- }
- // 異붽� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- this.issueHostingRepository.saveAndFlush(newIssueHosting);
}
}
}
--
Gitblit v1.8.0