From 39b3723acfbe0825ce13056ab5db6e5952674bc0 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 10 12월 2021 19:18:28 +0900
Subject: [PATCH] 업체추가 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index b055955..67037b3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -124,11 +124,12 @@
IspFieldVo ispFieldVo = new IspFieldVo();
HostingFieldVo hostingFieldVo = new HostingFieldVo();
+ IspField ispField = new IspField();
+ HostingField hostingField = new HostingField();
+
Long companyId = companyFieldCondition.getId();
if (companyId != null) {
CompanyField companyField = this.getCompany(companyId);
- IspField ispField = null;
- HostingField hostingField = null;
if(companyField.getIspId() != null){
ispField = this.ispFieldRepository.getOne(companyField.getIspId());
}
@@ -210,17 +211,21 @@
for (Map<String, Object> result : results) {
CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class);
- if(companyFieldVo.getIspId() != null){
+ if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1){
//IspField ispField = this.ispFieldRepository.getOne(companyFieldVo.getIspId());
IspField ispField = this.ispFieldService.getIsp(companyFieldVo.getIspId());
- IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
- companyFieldVo.setIspFieldVo(ispFieldVo);
+ if(ispField != null){
+ IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
+ companyFieldVo.setIspFieldVo(ispFieldVo);
+ }
}
- if(companyFieldVo.getHostingId() != null){
+ if(companyFieldVo.getHostingId() != null && companyFieldVo.getIspId() != -1){
//HostingField hostingField = this.hostingFieldRepository.getOne(companyFieldVo.getHostingId());
HostingField hostingField = this.hostingFieldService.getHosting(companyFieldVo.getHostingId());
- HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
- companyFieldVo.setHostingFieldVo(hostingFieldVo);
+ if(hostingField != null){
+ HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
+ companyFieldVo.setHostingFieldVo(hostingFieldVo);
+ }
}
companyFieldVos.add(companyFieldVo);
}
--
Gitblit v1.8.0