From 3d1d29425c873257a65f4fde8a4bfc43d6211b83 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 15:58:50 +0900
Subject: [PATCH] - 완료이슈 숨기기 기능 - 업체관리 오류 해결
---
src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java | 14 +++++++-------
src/main/webapp/views/issue/issueListNormal.html | 7 ++++---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 8 ++++----
src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java | 14 +++++++-------
4 files changed, 22 insertions(+), 21 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 383e006..f777fde 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -194,15 +194,15 @@
String url = companyFieldVo.getUrl();
IspField ispField = this.ispFieldRepository.findByUrl(url);
- IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
- if(ispFieldVo != null){
+ if(ispField != null){
+ IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
ispFieldVos.add(ispFieldVo);
}
companyFieldVo.setIspFieldVos(ispFieldVos);
HostingField hostingField = this.hostingFieldRepository.findByUrl(url);
- HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
- if(hostingFieldVo != null){
+ if(hostingField != null){
+ HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
hostingFieldVos.add(hostingFieldVo);
}
companyFieldVo.setHostingFieldVos(hostingFieldVos);
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..855418a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java
@@ -58,8 +58,10 @@
// Hosting 異붽�
@Override
public HostingField add(HostingFieldForm HostingFieldForm) {
- // url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(HostingFieldForm.getUrl(), null);
+ if(HostingFieldForm.getUrl() != null){
+ // url �쑀�슚�꽦 泥댄겕
+ this.verifyUrl(HostingFieldForm.getUrl(), null);
+ }
HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
hostingFieldRepository.saveAndFlush(HostingField);
@@ -68,10 +70,6 @@
// 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){
@@ -117,7 +115,9 @@
@Override
public void modify(HostingFieldForm HostingFieldForm) {
// url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(HostingFieldForm.getUrl(), HostingFieldForm.getId());
+ if(HostingFieldForm.getUrl() != null){
+ this.verifyUrl(HostingFieldForm.getUrl(), HostingFieldForm.getId());
+ }
HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
hostingFieldRepository.saveAndFlush(HostingField);
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..d91bec3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
@@ -59,7 +59,9 @@
@Override
public IspField add(IspFieldForm IspFieldForm) {
// url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(IspFieldForm.getUrl(), null);
+ if(IspFieldForm.getUrl() != null){
+ this.verifyUrl(IspFieldForm.getUrl(), null);
+ }
IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
ispFieldRepository.saveAndFlush(IspField);
@@ -81,10 +83,6 @@
// 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){
@@ -116,8 +114,10 @@
// Isp �젙濡쒕�� �닔�젙�븳�떎.
@Override
public void modify(IspFieldForm IspFieldForm) {
- // url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(IspFieldForm.getUrl(), IspFieldForm.getId());
+ if(IspFieldForm.getUrl() != null){
+ // url �쑀�슚�꽦 泥댄겕
+ this.verifyUrl(IspFieldForm.getUrl(), IspFieldForm.getId());
+ }
IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
ispFieldRepository.saveAndFlush(IspField);
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 8bf619b..c6e249c 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -333,10 +333,11 @@
<form class="form-inline justify-content-sm-end pull-right" method="post" action="/issue/downloadExcel" name="issueListForm" >
<!--span class="badge-tip" function-tool-tip data-placement="top" data-toggle="tooltip" data-original-title="�뿊�� �떎�슫濡쒕뱶, �씪愿� 蹂�寃� �벑 �떎�뼇�븳 湲곕뒫�쓣 �젣怨듯빀�땲�떎.">?</span-->
<input type="hidden" name="conditions">
- <div class="btn-group">
- <input type="checkbox" ng-model="vm.hideIssue"> �셿猷� �씠�뒋 �닲湲곌린
- <button type="button" ng-click="fn.getPageList(0)">�깉濡쒓퀬移�</button>
+ <div>
+ �셿猷� �씠�뒋 �닲湲곌린
+ <label class='switch'><input type='checkbox' ng-model='vm.hideIssue' ng-click='fn.getPageList(0)'><span class='slider round'></span></label>
</div>
+
<div class="btn-group">
<button aria-expanded="false" aria-haspopup="true"
tabindex="-1"
--
Gitblit v1.8.0