From 8ecffbb61c5505475cd0738032abda5efe2a1812 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 18 11월 2021 21:36:32 +0900
Subject: [PATCH] 이슈 수정 완료
---
src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 aa9ff25..4b16e2c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
@@ -44,19 +44,27 @@
Map<String, Object> param = issueCompanyFields.get(0);
if (param != null) {
- IssueCompany newIssueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
- newIssueCompany.setIssue(issue);
CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId"));
- newIssueCompany.setCompanyField(companyField);
Set<IssueCompany> issueCompanies = issue.getIssueCompanies();
if (issueCompanies != null && issueCompanies.size() > 0) {
- IssueCompany oldIssueCompany = issueCompanies.iterator().next();
- ConvertUtil.copyProperties(newIssueCompany, oldIssueCompany);
+ IssueCompany issueCompany = issueCompanies.iterator().next();
+ issueCompany.setCompanyField(companyField);
+ issueCompany.setName(MapUtil.getString(param, "name"));
+ issueCompany.setEmail(MapUtil.getString(param, "email"));
+ issueCompany.setManager(MapUtil.getString(param, "manager"));
+ issueCompany.setTel(MapUtil.getString(param, "tel"));
+ issueCompany.setMemo(MapUtil.getString(param, "memo"));
+
+ this.issueCompanyRepository.saveAndFlush(issueCompany);
+
+ } else {
+ IssueCompany newIssueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
+ newIssueCompany.setIssue(issue);
+ newIssueCompany.setCompanyField(companyField);
+
+ this.issueCompanyRepository.saveAndFlush(newIssueCompany);
}
-
- this.issueCompanyRepository.saveAndFlush(newIssueCompany);
-
}
}
}
--
Gitblit v1.8.0