From 7cc3dc11ec3a48635b75040ca1117befe8c47f3c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 27 1월 2022 19:18:41 +0900
Subject: [PATCH] 업체 url 필수값 제거
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 41 +++++++++++++++++++++++------------------
src/main/webapp/views/companyField/companyFieldAdd.html | 3 +--
2 files changed, 24 insertions(+), 20 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 06e4059..82957da 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -83,8 +83,11 @@
public CompanyField addCompany(CompanyFieldForm companyFieldForm) {
// �뾽泥대챸 以묐났 泥댄겕
this.verifyTitle(companyFieldForm.getName(), null);
- // url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(companyFieldForm.getUrl(), null);
+
+ if (companyFieldForm.getUrl() != null) {
+ // url �쑀�슚�꽦 泥댄겕
+ this.verifyUrl(companyFieldForm.getUrl(), null);
+ }
if (companyFieldForm.getTelList() != null && companyFieldForm.getTelList().size() > 0) {
String tels = companyFieldForm.getTelList().toString();
@@ -109,12 +112,11 @@
// url �쑀�슚�꽦 泥댄겕
private void verifyUrl(String url, Long id) {
- if (StringUtils.isEmpty(url)) {
+ /*if (StringUtils.isEmpty(url)) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.COMPANY_NOT_URL));
- }
+ }*/
CompanyField companyField;
-
if(id == null){
companyField = this.companyFieldRepository.findByUrl(url);
} else {
@@ -222,8 +224,11 @@
public void modifyCompany(CompanyFieldForm companyFieldForm) {
// �뾽泥대챸 �쑀�슚�꽦 泥댄겕
this.verifyTitle(companyFieldForm.getName(), companyFieldForm.getId());
- // url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(companyFieldForm.getUrl(), companyFieldForm.getId());
+
+ if (companyFieldForm.getUrl() != null) {
+ // url �쑀�슚�꽦 泥댄겕
+ this.verifyUrl(companyFieldForm.getUrl(), companyFieldForm.getId());
+ }
if (companyFieldForm.getTelList() != null && companyFieldForm.getTelList().size() > 0) {
String tels = companyFieldForm.getTelList().toString();
@@ -466,7 +471,9 @@
case 1:
// url
- this.setCompanyFormUrl(cell, companyFieldForm, rowIndex);
+ if (cellNullCheck(cell)) {
+ this.setCompanyFormUrl(cell, companyFieldForm, rowIndex);
+ }
break;
case 2:
@@ -687,17 +694,15 @@
}
private void setCompanyFormUrl(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell == null) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_URL_IS_NULL, rowIndex));
- }
- String url = CommonUtil.convertExcelStringToCell(cell);
- if (url.contains(" ")) {
- url = url.replace(" ", "");
- }
- this.verifyUrl(url, null); //url �쑀�슚�꽦 寃��궗
+ if (cell != null) {
+ String url = CommonUtil.convertExcelStringToCell(cell);
+ if (url.contains(" ")) {
+ url = url.replace(" ", "");
+ }
+ this.verifyUrl(url, null); //url �쑀�슚�꽦 寃��궗
- companyFieldForm.setUrl(url);
+ companyFieldForm.setUrl(url);
+ }
}
// �뾽泥대챸 �쑀�슚�꽦 泥댄겕
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index c798aaf..75bad83 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -33,7 +33,6 @@
<div class="form-group">
<label for="companyFieldAddForm10" class="issue-label">
<span translate="companyField.url">url</span>
- <code class="highlighter-rouge">*</code>
</label>
<input id="companyFieldAddForm10"
name="url"
@@ -45,7 +44,7 @@
ng-maxlength="200"
maxlength="200"
ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
- required>
+ >
<div ng-show="companyFieldAddForm.url.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
--
Gitblit v1.8.0