From 64c34c4b11796c5517d60971e1768aa22aaa6deb Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 26 1월 2022 17:43:36 +0900
Subject: [PATCH] 업체 수정 시 오류 해결
---
src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js | 16 ++++----
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 2
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 14 +++---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 16 ++++----
src/main/webapp/scripts/app/issue/issueModify.controller.js | 16 ++++----
5 files changed, 32 insertions(+), 32 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 6fc161b..0e3b6e7 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -242,7 +242,7 @@
if (companyFieldForm.getChildSectorId() != null) {
CompanyFieldCategory companyFieldCategory = this.companyFieldCategoryService.find(companyFieldForm.getChildSectorId());
- if (!companyFieldCategory.getParentId().equals(companyFieldForm.getParentSectorId())) {
+ if (companyFieldCategory != null && !companyFieldCategory.getParentId().equals(companyFieldForm.getParentSectorId())) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.PARENT_SECTOR_NOT_EQUAL));
}
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index 238c910..6b9b468 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
@@ -187,14 +187,14 @@
var content = {
name : $rootScope.preventXss($scope.vm.form.name), // �뾽泥대챸
ispId : (function () { // ISP �븘�씠�뵒
- var ispId = -1;
+ var ispId = null;
if ($scope.vm.form.issueIspFields != null) {
ispId = $scope.vm.form.ispId;
}
return ispId;
})(),
hostingId : (function () { // Hosting �븘�씠�뵒
- var hostingId = -1;
+ var hostingId = null;
if ($scope.vm.form.issueHostingFields != null) {
hostingId = $scope.vm.form.hostingId;
}
@@ -238,35 +238,35 @@
url : $scope.vm.form.url, // url
memo : $scope.vm.form.memo, //鍮꾧퀬
companyTypeId : (function () {
- var companyTypeId = -1;
+ var companyTypeId = null;
if ($scope.vm.form.companyTypes != null && $scope.vm.form.companyTypes.length > 0) {
companyTypeId = $scope.vm.form.companyTypes[0].id;
}
return companyTypeId;
})(),
parentSectorId : (function () {
- var parentSectorId = -1;
+ var parentSectorId = null;
if ($scope.vm.form.parentSectors != null && $scope.vm.form.parentSectors.length > 0) {
parentSectorId = $scope.vm.form.parentSectors[0].id;
}
return parentSectorId;
})(),
childSectorId : (function () {
- var childSectorId = -1;
+ var childSectorId = null;
if ($scope.vm.form.childSectors != null && $scope.vm.form.childSectors.length > 0) {
childSectorId = $scope.vm.form.childSectors[0].id;
}
return childSectorId;
})(),
regionId : (function () {
- var regionId = -1;
+ var regionId = null;
if ($scope.vm.form.regions != null && $scope.vm.form.regions.length > 0) {
regionId = $scope.vm.form.regions[0].id;
}
return regionId;
})(),
statusId : (function () {
- var statusId = -1;
+ var statusId = null;
if ($scope.vm.form.statuses != null && $scope.vm.form.statuses.length > 0) {
statusId = $scope.vm.form.statuses[0].id;
} else if ($scope.vm.form.status !== ""){
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
index 16ded64..021f8d3 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
@@ -193,8 +193,8 @@
id : parameter.id,
name : $rootScope.preventXss($scope.vm.form.name),
ispId : (function () { // ISP �븘�씠�뵒
- var ispId = -1;
- if ($scope.vm.form.ispName !== "" && $scope.vm.form.ispId !== null && $scope.vm.form.ispId !== -1) {
+ var ispId = null;
+ if ($scope.vm.form.ispName !== "" && $scope.vm.form.ispId !== null && $scope.vm.form.ispId !== null) {
ispId = $scope.vm.form.ispId;
}else if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0) {
ispId = $scope.vm.form.issueIspFields[0].id;
@@ -202,7 +202,7 @@
return ispId;
})(),
hostingId : (function () { // Hosting �븘�씠�뵒
- var hostingId = -1;
+ var hostingId = null;
if ($scope.vm.form.hostingName !== "" && $scope.vm.form.hostingId !== null && $scope.vm.form.hostingId !== -1) {
hostingId = $scope.vm.form.hostingId;
}else if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) {
@@ -248,7 +248,7 @@
url : $rootScope.preventXss($scope.vm.form.url), // url
memo : $rootScope.preventXss($scope.vm.form.memo),
companyTypeId : (function () {
- var companyTypeId = -1;
+ var companyTypeId = null;
if ($scope.vm.form.companyTypes != null && $scope.vm.form.companyTypes.length > 0) {
companyTypeId = $scope.vm.form.companyTypes[0].id;
} else {
@@ -257,7 +257,7 @@
return companyTypeId;
})(),
parentSectorId : (function () {
- var parentSectorId = -1;
+ var parentSectorId = null;
if ($scope.vm.form.parentSectors != null && $scope.vm.form.parentSectors.length > 0) {
parentSectorId = $scope.vm.form.parentSectors[0].id;
} else {
@@ -266,7 +266,7 @@
return parentSectorId;
})(),
childSectorId : (function () {
- var childSectorId = -1;
+ var childSectorId = null;
if ($scope.vm.form.childSectors != null && $scope.vm.form.childSectors.length > 0) {
childSectorId = $scope.vm.form.childSectors[0].id;
} else {
@@ -275,7 +275,7 @@
return childSectorId;
})(),
regionId : (function () {
- var regionId = -1;
+ var regionId = null;
if ($scope.vm.form.regions != null && $scope.vm.form.regions.length > 0) {
regionId = $scope.vm.form.regions[0].id;
} else {
@@ -284,7 +284,7 @@
return regionId;
})(),
statusId : (function () {
- var statusId = -1;
+ var statusId = null;
if ($scope.vm.form.statuses != null && $scope.vm.form.statuses.length > 0) {
statusId = $scope.vm.form.statuses[0].id;
} else {
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index e0ed432..b75de6a 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -603,7 +603,7 @@
severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
companyId : (function () { // �뾽泥� �븘�씠�뵒
- var companyId = -1;
+ var companyId = null;
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) {
companyId = $scope.vm.form.issueCompanyFields[0].id;
}
@@ -611,7 +611,7 @@
})(),
ispId : (function () { // ISP �븘�씠�뵒
- var ispId = -1;
+ var ispId = null;
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) {
if ($scope.vm.form.issueCompanyFields[0].ispId != null){
ispId = $scope.vm.form.issueCompanyFields[0].ispId;
@@ -623,7 +623,7 @@
})(),
hostingId : (function () { // Hosting �븘�씠�뵒
- var hostingId = -1;
+ var hostingId = null;
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) {
if ($scope.vm.form.issueCompanyFields[0].hostingId != null){
hostingId = $scope.vm.form.issueCompanyFields[0].hostingId;
@@ -692,35 +692,35 @@
companyUrl :$scope.vm.companyUrl,
companyMemo : $scope.vm.companyMemo,
companyTypeId : (function () {
- var companyTypeId = -1;
+ var companyTypeId = null;
if ($scope.vm.form.companyTypes != null && $scope.vm.form.companyTypes.length > 0) {
companyTypeId = $scope.vm.form.companyTypes[0].id;
}
return companyTypeId;
})(),
parentSectorId : (function () {
- var parentSectorId = -1;
+ var parentSectorId = null;
if ($scope.vm.form.parentSectors != null && $scope.vm.form.parentSectors.length > 0) {
parentSectorId = $scope.vm.form.parentSectors[0].id;
}
return parentSectorId;
})(),
childSectorId : (function () {
- var childSectorId = -1;
+ var childSectorId = null;
if ($scope.vm.form.childSectors != null && $scope.vm.form.childSectors.length > 0) {
childSectorId = $scope.vm.form.childSectors[0].id;
}
return childSectorId;
})(),
regionId : (function () {
- var regionId = -1;
+ var regionId = null;
if ($scope.vm.form.regions != null && $scope.vm.form.regions.length > 0) {
regionId = $scope.vm.form.regions[0].id;
}
return regionId;
})(),
statusId : (function () {
- var statusId = -1;
+ var statusId = null;
if ($scope.vm.form.statuses != null && $scope.vm.form.statuses.length > 0) {
statusId = $scope.vm.form.statuses[0].id;
} else if ($scope.vm.form.status !== ""){
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index cf0dc79..fbbc251 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -564,7 +564,7 @@
companyMemo : $scope.vm.companyMemo,
companyTypeId : (function () {
- var companyTypeId = -1;
+ var companyTypeId = null;
if ($scope.vm.form.companyTypes != null && $scope.vm.form.companyTypes.length > 0) {
companyTypeId = $scope.vm.form.companyTypes[0].id;
} else {
@@ -573,7 +573,7 @@
return companyTypeId;
})(),
parentSectorId : (function () {
- var parentSectorId = -1;
+ var parentSectorId = null;
if ($scope.vm.form.parentSectors != null && $scope.vm.form.parentSectors.length > 0) {
parentSectorId = $scope.vm.form.parentSectors[0].id;
} else {
@@ -582,7 +582,7 @@
return parentSectorId;
})(),
childSectorId : (function () {
- var childSectorId = -1;
+ var childSectorId = null;
if ($scope.vm.form.childSectors != null && $scope.vm.form.childSectors.length > 0) {
childSectorId = $scope.vm.form.childSectors[0].id;
} else {
@@ -591,7 +591,7 @@
return childSectorId;
})(),
regionId : (function () {
- var regionId = -1;
+ var regionId = null;
if ($scope.vm.form.regions != null && $scope.vm.form.regions.length > 0) {
regionId = $scope.vm.form.regions[0].id;
} else {
@@ -600,7 +600,7 @@
return regionId;
})(),
statusId : (function () {
- var statusId = -1;
+ var statusId = null;
if ($scope.vm.form.statuses != null && $scope.vm.form.statuses.length > 0) {
statusId = $scope.vm.form.statuses[0].id;
} else {
@@ -641,7 +641,7 @@
issueStatusId : $scope.vm.form.issueStatusId, // �씠�뒋 �긽�깭 �븘�씠�뵒
companyId : (function () {
- var companyId = -1;
+ var companyId = null;
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) {
companyId = $scope.vm.form.issueCompanyFields[0].id;
@@ -651,7 +651,7 @@
}),
ispId : (function () {
- var ispId = -1;
+ var ispId = null;
if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0) {
ispId = $scope.vm.form.issueIspFields[0].id;
@@ -661,7 +661,7 @@
}),
hostingId : (function () {
- var hostingId = -1;
+ var hostingId = null;
if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) {
hostingId = $scope.vm.form.issueHostingFields[0].id;
--
Gitblit v1.8.0