From 39b3723acfbe0825ce13056ab5db6e5952674bc0 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 10 12월 2021 19:18:28 +0900
Subject: [PATCH] 업체추가 오류 수정
---
src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js | 8 ++++++--
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 21 +++++++++++++--------
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 4 ++--
src/main/webapp/i18n/ko/global.json | 2 ++
src/main/webapp/views/companyField/companyFieldModify.html | 4 ++--
src/main/webapp/views/companyField/companyFieldAdd.html | 4 ++--
6 files changed, 27 insertions(+), 16 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 b055955..67037b3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -124,11 +124,12 @@
IspFieldVo ispFieldVo = new IspFieldVo();
HostingFieldVo hostingFieldVo = new HostingFieldVo();
+ IspField ispField = new IspField();
+ HostingField hostingField = new HostingField();
+
Long companyId = companyFieldCondition.getId();
if (companyId != null) {
CompanyField companyField = this.getCompany(companyId);
- IspField ispField = null;
- HostingField hostingField = null;
if(companyField.getIspId() != null){
ispField = this.ispFieldRepository.getOne(companyField.getIspId());
}
@@ -210,17 +211,21 @@
for (Map<String, Object> result : results) {
CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class);
- if(companyFieldVo.getIspId() != null){
+ if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1){
//IspField ispField = this.ispFieldRepository.getOne(companyFieldVo.getIspId());
IspField ispField = this.ispFieldService.getIsp(companyFieldVo.getIspId());
- IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
- companyFieldVo.setIspFieldVo(ispFieldVo);
+ if(ispField != null){
+ IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
+ companyFieldVo.setIspFieldVo(ispFieldVo);
+ }
}
- if(companyFieldVo.getHostingId() != null){
+ if(companyFieldVo.getHostingId() != null && companyFieldVo.getIspId() != -1){
//HostingField hostingField = this.hostingFieldRepository.getOne(companyFieldVo.getHostingId());
HostingField hostingField = this.hostingFieldService.getHosting(companyFieldVo.getHostingId());
- HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
- companyFieldVo.setHostingFieldVo(hostingFieldVo);
+ if(hostingField != null){
+ HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
+ companyFieldVo.setHostingFieldVo(hostingFieldVo);
+ }
}
companyFieldVos.add(companyFieldVo);
}
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index fd062aa..1a16158 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -925,6 +925,7 @@
},
"ispField" : {
"info": "ISP�젙蹂�",
+ "select": "ISP �꽑�깮",
"add" : "ISP�깮�꽦",
"name" : "ISP�씠由�",
"ispName" : "ISP紐�",
@@ -944,6 +945,7 @@
},
"hostingField" : {
"info": "�샇�뒪�똿�젙蹂�",
+ "select": "�샇�뒪�똿 �꽑�깮",
"add" : "�샇�뒪�똿�깮�꽦",
"name" : "�샇�뒪�똿�씠由�",
"manager" : "�샇�뒪�똿�씠由�",
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index 588bf42..41c6544 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
@@ -80,14 +80,14 @@
name : $rootScope.preventXss($scope.vm.form.name), // �뾽泥대챸
ispId : (function () { // ISP �븘�씠�뵒
var ispId = -1;
- if ($scope.vm.form.issueIspFields.length > 0) {
+ if ($scope.vm.form.issueIspFields != null) {
ispId = $scope.vm.form.ispId;
}
return ispId;
})(),
hostingId : (function () { // Hosting �븘�씠�뵒
var hostingId = -1;
- if ($scope.vm.form.issueHostingFields.length > 0) {
+ if ($scope.vm.form.issueHostingFields != null) {
hostingId = $scope.vm.form.hostingId;
}
return hostingId;
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
index 07968d8..7a452d3 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
@@ -149,8 +149,12 @@
$scope.vm.form.tel = result.data.content.tel;
$scope.vm.form.url = result.data.content.url;
$scope.vm.form.memo = result.data.content.memo;
- $scope.vm.form.ispName = result.data.content.ispFieldVo.name;
- $scope.vm.form.hostingName = result.data.content.hostingFieldVo.name;
+ if(result.data.content.ispFieldVo != null){
+ $scope.vm.form.ispName = result.data.content.ispFieldVo.name;
+ }
+ if(result.data.content.hostingFieldVo != null){
+ $scope.vm.form.hostingName = result.data.content.hostingFieldVo.name;
+ }
}
}
else {
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index 16fe873..ed0d363 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -32,7 +32,7 @@
<div class="form-group">
<label class="issue-label">
- <span translate="ispField.name">ISP �씠由�</span>
+ <span translate="ispField.select">ISP �꽑�깮</span>
</label>
<js-autocomplete-single data-input-name="ispField"
selected-model="vm.form.issueIspFields"
@@ -50,7 +50,7 @@
<div class="form-group">
<label class="issue-label">
- <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span>
+ <span translate="hostingField.select">�샇�뒪�똿 �꽑�깮</span>
</label>
<js-autocomplete-single data-input-name="hostingField"
selected-model="vm.form.issueHostingFields"
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index e171863..9909836 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -31,7 +31,7 @@
</div>
<div class="form-group">
<label class="issue-label">
- <span translate="ispField.name">ISP �씠由�</span>
+ <span translate="ispField.select">ISP �꽑�깮</span>
</label>
<js-autocomplete-single data-input-name="ispField"
selected-model="vm.form.issueIspFields"
@@ -49,7 +49,7 @@
<div class="form-group">
<label class="issue-label">
- <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span>
+ <span translate="hostingField.select">�샇�뒪�똿 �꽑�깮</span>
</label>
<js-autocomplete-single data-input-name="hostingField"
selected-model="vm.form.issueHostingFields"
--
Gitblit v1.8.0