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/IssueServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 1e6d6e8..de17002 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1628,8 +1628,12 @@
List<IssueCompanyVo> issueCompanyVos = Lists.newArrayList();
for(IssueCompany issueCompany : issue.getIssueCompanies()){
- IssueCompanyVo issueCompanyVo = ConvertUtil.copyProperties(issueCompany.getCompanyField(), IssueCompanyVo.class);
+ IssueCompanyVo issueCompanyVo = ConvertUtil.copyProperties(issueCompany, IssueCompanyVo.class);
issueCompanyVo.setId(issueCompany.getId());
+ CompanyField companyField = issueCompany.getCompanyField();
+ if (companyField != null) {
+ issueCompanyVo.setCompanyId(issueCompany.getCompanyField().getId());
+ }
issueCompanyVos.add(issueCompanyVo);
}
issueVo.setIssueCompanyVos(issueCompanyVos);
@@ -1640,7 +1644,7 @@
List<IssueIspVo> issueIspVos = Lists.newArrayList();
for(IssueIsp issueIsp : issue.getIssueIspFields()){
- IssueIspVo issueIspVo = ConvertUtil.copyProperties(issueIsp.getIspField(), IssueIspVo.class);
+ IssueIspVo issueIspVo = ConvertUtil.copyProperties(issueIsp, IssueIspVo.class);
issueIspVo.setId(issueIsp.getId());
issueIspVos.add(issueIspVo);
}
@@ -1652,7 +1656,7 @@
List<IssueHostingVo> issueHostingVos = Lists.newArrayList();
for(IssueHosting issueHosting : issue.getIssueHostingFields()){
- IssueHostingVo issueHostingVo = ConvertUtil.copyProperties(issueHosting.getHostingField(), IssueHostingVo.class);
+ IssueHostingVo issueHostingVo = ConvertUtil.copyProperties(issueHosting, IssueHostingVo.class);
issueHostingVo.setId(issueHosting.getId());
issueHostingVos.add(issueHostingVo);
}
--
Gitblit v1.8.0