From 709c9fb1f42a70da66ab9b759014b009b1c67d95 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 14:03:30 +0900
Subject: [PATCH] 충돌 병합
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 58 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 30 insertions(+), 28 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 be17a29..b1460f5 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -121,39 +121,41 @@
if (issue != null) {
StringBuilder sb = new StringBuilder();
List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
-
if (issueHostingFields != null && issueHostingFields.size() > 0) {
Map<String, Object> param = issueHostingFields.get(0);
- IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
- if (issueHosting != null) { //�닔�젙 �떆
- // 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set �빐二쇨린
- issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
-
- 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"));
-
- this.issueHostingRepository.saveAndFlush(issueHosting);
+ if (issueHostingFields != null && issueHostingFields.size() > 0) {
+ IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
- } else { //異붽� �떆
- IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
- // 異붽� �씠�젰
- issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- this.issueHostingRepository.saveAndFlush(newIssueHosting);
+ if (issueHosting != null) { //�닔�젙 �떆
+ // 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set �빐二쇨린
+ issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+
+ 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"));
+
+ this.issueHostingRepository.saveAndFlush(issueHosting);
+
+ } else { //異붽� �떆
+ IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
+ // 異붽� �씠�젰
+ 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("")) {
+ // �샇�뒪�똿 �젙蹂� 吏곸젒 異붽�
+ CreateHostingField(issueForm, issue);
+ } else {
+ this.issueHostingRepository.deleteByIssueId(issue.getId());
+ this.issueHostingRepository.flush();
}
- } else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
- // �샇�뒪�똿 �젙蹂� 吏곸젒 異붽�
- CreateHostingField(issueForm, issue);
- } else {
- this.issueHostingRepository.deleteByIssueId(issue.getId());
- this.issueHostingRepository.flush();
}
}
}
--
Gitblit v1.8.0