From 4c88eb1da24c07d53e244065241ce0549c99cbd4 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 09 12월 2021 16:00:18 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 383e006..f777fde 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -194,15 +194,15 @@
String url = companyFieldVo.getUrl();
IspField ispField = this.ispFieldRepository.findByUrl(url);
- IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
- if(ispFieldVo != null){
+ if(ispField != null){
+ IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
ispFieldVos.add(ispFieldVo);
}
companyFieldVo.setIspFieldVos(ispFieldVos);
HostingField hostingField = this.hostingFieldRepository.findByUrl(url);
- HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
- if(hostingFieldVo != null){
+ if(hostingField != null){
+ HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
hostingFieldVos.add(hostingFieldVo);
}
companyFieldVo.setHostingFieldVos(hostingFieldVos);
--
Gitblit v1.8.0