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 | 36 ++++++++----------------------------
1 files changed, 8 insertions(+), 28 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 d969fe6..d2038a4 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java
@@ -58,32 +58,13 @@
// Hosting 異붽�
@Override
public HostingField add(HostingFieldForm HostingFieldForm) {
- // url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(HostingFieldForm.getUrl(), null);
-
- HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
- hostingFieldRepository.saveAndFlush(HostingField);
- return HostingField;
- }
-
- // url �쑀�슚�꽦 泥댄겕
- private void verifyUrl(String url, Long id) {
- if (StringUtils.isEmpty(url)) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_URL));
- }
- HostingField hostingField;
-
- if(id == null){
- hostingField = this.hostingFieldRepository.findByUrl(url);
+ HostingField hostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
+ if (hostingField.getCode() != null && !hostingField.getCode().equals("")) {
+ hostingFieldRepository.saveAndFlush(hostingField);
} else {
- hostingField = this.hostingFieldRepository.findByUrlAndIdNot(url,id);
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.HOSTING_CODE_NOT_ENTER));
}
-
- if (hostingField != null) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_USED_URL));
- }
+ return hostingField;
}
// Hosting 紐⑸줉�쓣 媛��졇�삩�떎.
@@ -99,6 +80,9 @@
return this.convertHostingVoToMap(results, totalHostingCount, pageable, resJsonData);
}
+ public Map<String, Object> find(Long id) {
+ return this.hostingFieldMapper.findById(id);
+ }
// Hosting �긽�꽭 議고쉶�븳�떎.
@Override
@@ -116,13 +100,9 @@
// Hosting �젙濡쒕�� �닔�젙�븳�떎.
@Override
public void modify(HostingFieldForm HostingFieldForm) {
- // url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(HostingFieldForm.getUrl(), HostingFieldForm.getId());
-
HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
hostingFieldRepository.saveAndFlush(HostingField);
}
-
// Hosting瑜� �궘�젣�븳�떎.
@Override
--
Gitblit v1.8.0