From 6565e26508224b5d1de1ff7cf0f263fe196790e9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 15:54:06 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
index 110f026..2893698 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
@@ -58,9 +58,6 @@
// Isp 異붽�
@Override
public IspField add(IspFieldForm IspFieldForm) {
- // url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(IspFieldForm.getUrl(), null);
-
IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
ispFieldRepository.saveAndFlush(IspField);
return IspField;
@@ -79,26 +76,9 @@
return this.convertIspVoToMap(results, totalIspCount, pageable, resJsonData);
}
- // url �쑀�슚�꽦 泥댄겕
- private void verifyUrl(String url, Long id) {
- if (StringUtils.isEmpty(url)) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_URL));
- }
- IspField ispField;
-
- if(id == null){
- ispField = this.ispFieldRepository.findByUrl(url);
- } else {
- ispField = this.ispFieldRepository.findByUrlAndIdNot(url,id);
- }
-
- if (ispField != null) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_USED_URL));
- }
+ public Map<String, Object> find(Long id) {
+ return this.ispFieldMapper.findById(id);
}
-
// Isp �긽�꽭 議고쉶�븳�떎.
@Override
@@ -116,8 +96,8 @@
// Isp �젙濡쒕�� �닔�젙�븳�떎.
@Override
public void modify(IspFieldForm IspFieldForm) {
- // url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(IspFieldForm.getUrl(), IspFieldForm.getId());
+ if(IspFieldForm.getUrl() != null){
+ }
IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
ispFieldRepository.saveAndFlush(IspField);
--
Gitblit v1.8.0