From cbf3895fb11b069c3ac00c5fe1fb04b4bb931567 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 10:52:30 +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 | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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..8a39129 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -1,9 +1,6 @@
package kr.wisestone.owl.service.impl;
-import kr.wisestone.owl.domain.CompanyField;
-import kr.wisestone.owl.domain.CustomField;
-import kr.wisestone.owl.domain.HostingField;
-import kr.wisestone.owl.domain.IspField;
+import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.repository.HostingFieldRepository;
import kr.wisestone.owl.repository.IspFieldRepository;
import kr.wisestone.owl.service.*;
@@ -116,6 +113,10 @@
return this.convertCompanyVoToMap(results, totalCompanyCount, pageable, resJsonData);
}
+ public List<Map<String, Object>> find(CompanyFieldCondition condition) {
+ return this.companyFieldMapper.find(condition);
+ }
+
// �뾽泥� �긽�꽭 議고쉶�븳�떎.
@Override
@Transactional
@@ -124,11 +125,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 +212,19 @@
for (Map<String, Object> result : results) {
CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class);
- if(companyFieldVo.getIspId() != null){
- //IspField ispField = this.ispFieldRepository.getOne(companyFieldVo.getIspId());
+ if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1){
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){
- //HostingField hostingField = this.hostingFieldRepository.getOne(companyFieldVo.getHostingId());
+ if(companyFieldVo.getHostingId() != null && companyFieldVo.getHostingId() != -1){
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