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/IssueIspServiceImpl.java | 88 ++++++++++++++++++++++---------------------
1 files changed, 45 insertions(+), 43 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 a87e858..66c19f9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -82,58 +82,60 @@
public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
if (issue != null) {
List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
- Map<String, Object> param = issueIspFields.get(0);
-
if (issueIspFields != null && issueIspFields.size() > 0) {
- IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
+ Map<String, Object> param = issueIspFields.get(0);
- if (issueIsp != null) {//�닔�젙 �떆
- issueIsp.setName(MapUtil.getString(param, "name"));
- issueIsp.setEmail(MapUtil.getString(param, "email"));
- issueIsp.setCode(MapUtil.getString(param, "code"));
- issueIsp.setUrl(MapUtil.getString(param, "url"));
- issueIsp.setManager(MapUtil.getString(param, "manager"));
- issueIsp.setTel(MapUtil.getString(param, "tel"));
- issueIsp.setMemo(MapUtil.getString(param, "memo"));
- // 蹂�寃� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- this.issueIspRepository.saveAndFlush(issueIsp);
+ if (issueIspFields != null && issueIspFields.size() > 0) {
+ IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
- } else { //異붽� �떆
- IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
+ if (issueIsp != null) {//�닔�젙 �떆
+ issueIsp.setName(MapUtil.getString(param, "name"));
+ issueIsp.setEmail(MapUtil.getString(param, "email"));
+ issueIsp.setCode(MapUtil.getString(param, "code"));
+ issueIsp.setUrl(MapUtil.getString(param, "url"));
+ issueIsp.setManager(MapUtil.getString(param, "manager"));
+ issueIsp.setTel(MapUtil.getString(param, "tel"));
+ issueIsp.setMemo(MapUtil.getString(param, "memo"));
+ // 蹂�寃� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueIspRepository.saveAndFlush(issueIsp);
+
+ } else { //異붽� �떆
+ IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueIspRepository.saveAndFlush(newIssueIsp);
+ }
+ }
+ // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆
+ else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
+ // issueIsp �븘�뱶 �뤌 留뚮뱾湲�
+ IspFieldForm ispFieldForm = new IspFieldForm();
+ ispFieldForm.setName(issueForm.getIspName());
+ ispFieldForm.setCode(issueForm.getIspCode());
+ ispFieldForm.setEmail(issueForm.getIspEmail());
+ ispFieldForm.setUrl(issueForm.getIspUrl());
+ ispFieldForm.setManager(issueForm.getIspManager());
+ ispFieldForm.setTel(issueForm.getIspTel());
+ ispFieldForm.setMemo(issueForm.getIspMemo());
+
+ IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue);
+ IspField ispField = new IspField();
+ // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 ISP 紐⑸줉�뿉 異붽�
+ if (newIssueIsp.getIspField() == null) {
+ ispField = this.ispFieldService.add(ispFieldForm);
+ newIssueIsp.setIspField(ispField);
+ }
// 異붽� �씠�젰
StringBuilder sb = new StringBuilder();
issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
this.issueIspRepository.saveAndFlush(newIssueIsp);
}
- }
- // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆
- else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
- // issueIsp �븘�뱶 �뤌 留뚮뱾湲�
- IspFieldForm ispFieldForm = new IspFieldForm();
- ispFieldForm.setName(issueForm.getIspName());
- ispFieldForm.setCode(issueForm.getIspCode());
- ispFieldForm.setEmail(issueForm.getIspEmail());
- ispFieldForm.setUrl(issueForm.getIspUrl());
- ispFieldForm.setManager(issueForm.getIspManager());
- ispFieldForm.setTel(issueForm.getIspTel());
- ispFieldForm.setMemo(issueForm.getIspMemo());
-
- IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue);
- IspField ispField = new IspField();
- // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 ISP 紐⑸줉�뿉 異붽�
- if (newIssueIsp.getIspField() == null) {
- ispField = this.ispFieldService.add(ispFieldForm);
- newIssueIsp.setIspField(ispField);
- }
- // 異붽� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- this.issueIspRepository.saveAndFlush(newIssueIsp);
}
}
}
--
Gitblit v1.8.0