From 248924e3a9e12125a850f8e3d457e4b1f49f348c Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 16 12월 2021 09:45:14 +0900
Subject: [PATCH] 사용자등급, 부서표시 추가
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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..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
@@ -212,15 +213,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