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/HostingFieldServiceImpl.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java index eee1084..d2038a4 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java @@ -4,6 +4,7 @@ import kr.wisestone.owl.common.ExcelConditionCheck; import kr.wisestone.owl.constant.Constants; import kr.wisestone.owl.constant.MsgConstants; +import kr.wisestone.owl.domain.CompanyField; import kr.wisestone.owl.domain.HostingField; import kr.wisestone.owl.exception.OwlRuntimeException; import kr.wisestone.owl.mapper.HostingFieldMapper; @@ -18,6 +19,7 @@ import kr.wisestone.owl.web.condition.HostingFieldCondition; import kr.wisestone.owl.web.form.HostingFieldForm; import kr.wisestone.owl.web.view.ExcelView; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -56,9 +58,13 @@ // Hosting 異붽� @Override public HostingField add(HostingFieldForm HostingFieldForm) { - HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class); - hostingFieldRepository.saveAndFlush(HostingField); - return HostingField; + HostingField hostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class); + if (hostingField.getCode() != null && !hostingField.getCode().equals("")) { + hostingFieldRepository.saveAndFlush(hostingField); + } else { + throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.HOSTING_CODE_NOT_ENTER)); + } + return hostingField; } // Hosting 紐⑸줉�쓣 媛��졇�삩�떎. @@ -74,6 +80,9 @@ return this.convertHostingVoToMap(results, totalHostingCount, pageable, resJsonData); } + public Map<String, Object> find(Long id) { + return this.hostingFieldMapper.findById(id); + } // Hosting �긽�꽭 議고쉶�븳�떎. @Override @@ -94,7 +103,6 @@ HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class); hostingFieldRepository.saveAndFlush(HostingField); } - // Hosting瑜� �궘�젣�븳�떎. @Override -- Gitblit v1.8.0