From 8672cdbd8817957c1fb1996fb870e358c5b6022c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 16:28:21 +0900
Subject: [PATCH] - 헤더에 일반 메일 보내기 기능 추가 - 업체 엑셀 다운로드 시 카테고리 항목들도 보여지도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 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 b1460f5..d33943c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -124,38 +124,36 @@
if (issueHostingFields != null && issueHostingFields.size() > 0) {
Map<String, Object> param = issueHostingFields.get(0);
- if (issueHostingFields != null && issueHostingFields.size() > 0) {
- IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
+ 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());
+ 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"));
+ 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);
+ 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 { //異붽� �떆
+ 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();
}
}
}
--
Gitblit v1.8.0