From fe2b018f2c33d4444ed8a9c731f78e8f9ec6aadc Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 14 12월 2021 10:37:28 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 5da56d6..7255a12 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -388,8 +388,8 @@
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
- var ispFieldVos = result[0].ispFieldVos[0];
- var hostingFieldVos = result[0].hostingFieldVos[0];
+ var ispFieldVo = result[0].ispFieldVo;
+ var hostingFieldVo = result[0].hostingFieldVo;
$scope.vm.companyId = result[0].id;
$scope.vm.companyName = result[0].name;
@@ -399,24 +399,24 @@
$scope.vm.companyUrl = result[0].url;
$scope.vm.companyMemo = result[0].memo;
- $scope.vm.ispName = ispFieldVos.name;
- $scope.vm.ispCode = ispFieldVos.code;
- $scope.vm.ispManager = ispFieldVos.manager;
- $scope.vm.ispTel = ispFieldVos.tel;
- $scope.vm.ispEmail = ispFieldVos.email;
- $scope.vm.ispUrl = ispFieldVos.url;
- $scope.vm.ispMemo = ispFieldVos.memo;
+ $scope.vm.ispName = ispFieldVo.name;
+ $scope.vm.ispCode = ispFieldVo.code;
+ $scope.vm.ispManager = ispFieldVo.manager;
+ $scope.vm.ispTel = ispFieldVo.tel;
+ $scope.vm.ispEmail = ispFieldVo.email;
+ $scope.vm.ispUrl = ispFieldVo.url;
+ $scope.vm.ispMemo = ispFieldVo.memo;
- $scope.vm.hostingName = hostingFieldVos.name;
- $scope.vm.hostingCode = hostingFieldVos.code;
- $scope.vm.hostingManager = hostingFieldVos.manager;
- $scope.vm.hostingTel = hostingFieldVos.tel;
- $scope.vm.hostingEmail = hostingFieldVos.email;
- $scope.vm.hostingUrl = hostingFieldVos.url;
- $scope.vm.hostingMemo = hostingFieldVos.memo;
+ $scope.vm.hostingName = hostingFieldVo.name;
+ $scope.vm.hostingCode = hostingFieldVo.code;
+ $scope.vm.hostingManager = hostingFieldVo.manager;
+ $scope.vm.hostingTel = hostingFieldVo.tel;
+ $scope.vm.hostingEmail = hostingFieldVo.email;
+ $scope.vm.hostingUrl = hostingFieldVo.url;
+ $scope.vm.hostingMemo = hostingFieldVo.memo;
});
- // ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
+ //ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("ispFieldEvent", function (event, result) {
$scope.vm.ispId = result[0].id;
$scope.vm.ispName = result[0].name;
@@ -464,7 +464,7 @@
companyId : (function () { // �뾽泥� �븘�씠�뵒
var companyId = -1;
- if ($scope.vm.form.issueCompanyFields.length > 0) {
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) {
companyId = $scope.vm.form.issueCompanyFields[0].id;
}
return companyId;
@@ -472,7 +472,7 @@
ispId : (function () { // ISP �븘�씠�뵒
var ispId = -1;
- if ($scope.vm.form.issueIspFields.length > 0) {
+ if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0) {
ispId = $scope.vm.form.issueIspFields[0].id;
}
return ispId;
@@ -480,7 +480,7 @@
hostingId : (function () { // Hosting �븘�씠�뵒
var hostingId = -1;
- if ($scope.vm.form.issueHostingFields.length > 0) {
+ if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) {
hostingId = $scope.vm.form.issueHostingFields[0].id;
}
return hostingId;
--
Gitblit v1.8.0