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/IssueCompanyServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
index 94e0681..54e03d3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
@@ -47,7 +47,7 @@
if (issueCompanyFields != null && issueCompanyFields.size() > 0) {
Map<String, Object> param = issueCompanyFields.get(0);
- if (param != null) {
+ if (param != null && param.get("companyId") != null && param.get("companyId") != "") {
CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId")); //companyId 媛��졇�삤湲�
Set<IssueCompany> issueCompanies = issue.getIssueCompanies();
@@ -62,20 +62,24 @@
issueCompany.setCompanyField(companyField);
issueCompany.setName(MapUtil.getString(param, "name"));
issueCompany.setEmail(MapUtil.getString(param, "email"));
+ issueCompany.setUrl(MapUtil.getString(param, "url"));
issueCompany.setManager(MapUtil.getString(param, "manager"));
issueCompany.setTel(MapUtil.getString(param, "tel"));
issueCompany.setMemo(MapUtil.getString(param, "memo"));
} else { //異붽� �븷 寃쎌슦
issueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
issueCompany.setIssue(issue);
- issueCompany.setCompanyField(companyField);
+ if (companyField != null) {
+ issueCompany.setCompanyField(companyField);
+ }
// 異붽� �씠�젰
StringBuilder sb = new StringBuilder();
issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, param, issueCompany, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
this.issueCompanyRepository.saveAndFlush(issueCompany);
-
+ } else {
+ this.issueCompanyRepository.deleteById(MapUtil.getLong(param, "id"));
}
}
}
--
Gitblit v1.8.0