From 6a8cacfc31f8ac932844a122940fdfd127c117ac Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 수, 09 2월 2022 09:17:20 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 eda71d1..f0b018b 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -116,16 +116,18 @@
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.COMPANY_NOT_URL));
}*/
- CompanyField companyField;
- if(id == null){
- companyField = this.companyFieldRepository.findByUrl(url);
- } else {
- companyField = this.companyFieldRepository.findByUrlAndIdNot(url,id);
- }
+ if (!StringUtils.isEmpty(url)) {
+ CompanyField companyField;
+ if(id == null){
+ companyField = this.companyFieldRepository.findByUrl(url);
+ } else {
+ companyField = this.companyFieldRepository.findByUrlAndIdNot(url,id);
+ }
- if (companyField != null) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANY_USED_URL));
+ if (companyField != null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.COMPANY_USED_URL));
+ }
}
}
--
Gitblit v1.8.0