From ae3ebd4f29fd1267221c0e37b9cb06aa885bdcc1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 10:51:59 +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 | 4 +---
1 files changed, 1 insertions(+), 3 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 67037b3..ed1783e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -212,15 +212,13 @@
for (Map<String, Object> result : results) {
CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class);
if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1){
- //IspField ispField = this.ispFieldRepository.getOne(companyFieldVo.getIspId());
IspField ispField = this.ispFieldService.getIsp(companyFieldVo.getIspId());
if(ispField != null){
IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
companyFieldVo.setIspFieldVo(ispFieldVo);
}
}
- if(companyFieldVo.getHostingId() != null && companyFieldVo.getIspId() != -1){
- //HostingField hostingField = this.hostingFieldRepository.getOne(companyFieldVo.getHostingId());
+ if(companyFieldVo.getHostingId() != null && companyFieldVo.getHostingId() != -1){
HostingField hostingField = this.hostingFieldService.getHosting(companyFieldVo.getHostingId());
if(hostingField != null){
HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
--
Gitblit v1.8.0