From 0078f1017631a29518b4aa6f02b12fb6eb783466 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 27 1월 2022 19:07:26 +0900
Subject: [PATCH] - 이슈 엑셀 임포트 시 오류 해결 - 이슈 엑셀 임포트 시 상위 이슈 검색시 항목 선택 안되는 문제 해결
---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 75 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index b8ee166..fbbc251 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -436,10 +436,15 @@
}
$scope.$on("companyTypeEvent", function (event, result) {
- $scope.vm.form.companyTypeId = result[0].id;
+ $scope.vm.form.companyTypeId = result[0].id;
});
$scope.$on("parentSectorEvent", function (event, result) {
- $scope.vm.form.parentSectorId = result[0].id;
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ }
+ $scope.vm.form.childSectorId = "";
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
});
$scope.$on("childSectorEvent", function (event, result) {
$scope.vm.form.childSectorId = result[0].id;
@@ -518,26 +523,30 @@
// ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("ispFieldEvent", function (event, result) {
- $scope.vm.ispId = result[0].id;
- $scope.vm.ispName = result[0].name;
- $scope.vm.ispCode = result[0].code;
- $scope.vm.ispManager = result[0].manager;
- $scope.vm.ispTel = result[0].tel;
- $scope.vm.ispEmail = result[0].email;
- $scope.vm.ispUrl = result[0].url;
- $scope.vm.ispMemo = result[0].memo;
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.ispId = result[0].id;
+ $scope.vm.ispName = result[0].name;
+ $scope.vm.ispCode = result[0].code;
+ $scope.vm.ispManager = result[0].manager;
+ $scope.vm.ispTel = result[0].tel;
+ $scope.vm.ispEmail = result[0].email;
+ $scope.vm.ispUrl = result[0].url;
+ $scope.vm.ispMemo = result[0].memo;
+ }
});
// �샇�뒪�똿�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("hostingFieldEvent", function (event, result) {
- $scope.vm.hostingId = result[0].id;
- $scope.vm.hostingName = result[0].name;
- $scope.vm.hostingCode = result[0].code;
- $scope.vm.hostingManager = result[0].manager;
- $scope.vm.hostingTel = result[0].tel;
- $scope.vm.hostingEmail = result[0].email;
- $scope.vm.hostingUrl = result[0].url;
- $scope.vm.hostingMemo = result[0].memo;
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.hostingId = result[0].id;
+ $scope.vm.hostingName = result[0].name;
+ $scope.vm.hostingCode = result[0].code;
+ $scope.vm.hostingManager = result[0].manager;
+ $scope.vm.hostingTel = result[0].tel;
+ $scope.vm.hostingEmail = result[0].email;
+ $scope.vm.hostingUrl = result[0].url;
+ $scope.vm.hostingMemo = result[0].memo;
+ }
});
function formSubmit() {
@@ -555,8 +564,8 @@
companyMemo : $scope.vm.companyMemo,
companyTypeId : (function () {
- var companyTypeId = -1;
- if ($scope.vm.form.companyTypes != null) {
+ var companyTypeId = null;
+ if ($scope.vm.form.companyTypes != null && $scope.vm.form.companyTypes.length > 0) {
companyTypeId = $scope.vm.form.companyTypes[0].id;
} else {
companyTypeId = $scope.vm.form.companyTypeId;
@@ -564,8 +573,8 @@
return companyTypeId;
})(),
parentSectorId : (function () {
- var parentSectorId = -1;
- if ($scope.vm.form.parentSectors != null) {
+ var parentSectorId = null;
+ if ($scope.vm.form.parentSectors != null && $scope.vm.form.parentSectors.length > 0) {
parentSectorId = $scope.vm.form.parentSectors[0].id;
} else {
parentSectorId = $scope.vm.form.parentSectorId;
@@ -573,8 +582,8 @@
return parentSectorId;
})(),
childSectorId : (function () {
- var childSectorId = -1;
- if ($scope.vm.form.childSectors != null) {
+ var childSectorId = null;
+ if ($scope.vm.form.childSectors != null && $scope.vm.form.childSectors.length > 0) {
childSectorId = $scope.vm.form.childSectors[0].id;
} else {
childSectorId = $scope.vm.form.childSectorId;
@@ -582,8 +591,8 @@
return childSectorId;
})(),
regionId : (function () {
- var regionId = -1;
- if ($scope.vm.form.regions != null) {
+ var regionId = null;
+ if ($scope.vm.form.regions != null && $scope.vm.form.regions.length > 0) {
regionId = $scope.vm.form.regions[0].id;
} else {
regionId = $scope.vm.form.regionId;
@@ -591,8 +600,8 @@
return regionId;
})(),
statusId : (function () {
- var statusId = -1;
- if ($scope.vm.form.statuses != null) {
+ var statusId = null;
+ if ($scope.vm.form.statuses != null && $scope.vm.form.statuses.length > 0) {
statusId = $scope.vm.form.statuses[0].id;
} else {
statusId = $scope.vm.form.statusId;
@@ -632,9 +641,9 @@
issueStatusId : $scope.vm.form.issueStatusId, // �씠�뒋 �긽�깭 �븘�씠�뵒
companyId : (function () {
- var companyId = -1;
+ var companyId = null;
- 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;
}
@@ -642,9 +651,9 @@
}),
ispId : (function () {
- var ispId = -1;
+ var ispId = null;
- 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;
}
@@ -652,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