From 8e62d47c7210854b570db5e9164a6a9da6351c12 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 09 2월 2022 17:59:06 +0900 Subject: [PATCH] - 이슈 추가,수정 시 파트너 정보 null 체크 추가 --- src/main/webapp/scripts/app/issue/issueAddDown.controller.js | 125 +++++++++++++++++++++-------------------- 1 files changed, 63 insertions(+), 62 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js index e68f2ac..3b9a41f 100644 --- a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js @@ -185,7 +185,6 @@ // �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �떞�떦�옄 珥덇린�솕 $scope.$watch("vm.form.projects", function (newValue, oldValue) { - if (angular.isDefined(newValue)) { if (newValue.length < 1) { $scope.vm.form.users = []; @@ -450,70 +449,72 @@ // �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set) $scope.$on("companyFieldEvent", function (event, result) { - var ispFieldVo = result[0].ispFieldVo; - var hostingFieldVo = result[0].hostingFieldVo; + if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) { + var ispFieldVo = result[0].ispFieldVo; + var hostingFieldVo = result[0].hostingFieldVo; - $scope.vm.companyId = result[0].id; - $scope.vm.companyName = result[0].name; - $scope.vm.companyManager = result[0].manager; - $scope.vm.companyTel = result[0].tel; - $scope.vm.companyEmail = result[0].email; - $scope.vm.companyUrl = result[0].url; - $scope.vm.companyMemo = result[0].memo; - $scope.vm.form.companyTypeId = result[0].companyTypeId; - $scope.vm.form.parentSectorId = result[0].parentSectorId; - $scope.vm.form.childSectorId = result[0].childSectorId; - $scope.vm.form.regionId = result[0].regionId; - $scope.vm.form.statusId = result[0].statusId; - $scope.vm.form.companyType = result[0].companyTypeName; - $scope.vm.form.parentSector = result[0].parentSectorName; - $scope.vm.form.childSector = result[0].childSectorName; - $scope.vm.form.region = result[0].regionName; - $scope.vm.form.status = result[0].statusName; + $scope.vm.companyId = result[0].id; + $scope.vm.companyName = result[0].name; + $scope.vm.companyManager = result[0].manager; + $scope.vm.companyTel = result[0].tel; + $scope.vm.companyEmail = result[0].email; + $scope.vm.companyUrl = result[0].url; + $scope.vm.companyMemo = result[0].memo; + $scope.vm.form.companyTypeId = result[0].companyTypeId; + $scope.vm.form.parentSectorId = result[0].parentSectorId; + $scope.vm.form.childSectorId = result[0].childSectorId; + $scope.vm.form.regionId = result[0].regionId; + $scope.vm.form.statusId = result[0].statusId; + $scope.vm.form.companyType = result[0].companyTypeName; + $scope.vm.form.parentSector = result[0].parentSectorName; + $scope.vm.form.childSector = result[0].childSectorName; + $scope.vm.form.region = result[0].regionName; + $scope.vm.form.status = result[0].statusName; - $scope.vm.ispId = ""; - $scope.vm.ispName = ""; - $scope.vm.ispCode = ""; - $scope.vm.ispManager = ""; - $scope.vm.ispTel = ""; - $scope.vm.ispEmail = ""; - $scope.vm.ispUrl = ""; - $scope.vm.ispMemo = ""; + $scope.vm.ispId = ""; + $scope.vm.ispName = ""; + $scope.vm.ispCode = ""; + $scope.vm.ispManager = ""; + $scope.vm.ispTel = ""; + $scope.vm.ispEmail = ""; + $scope.vm.ispUrl = ""; + $scope.vm.ispMemo = ""; - $scope.vm.hostingId = ""; - $scope.vm.hostingName = ""; - $scope.vm.hostingCode = ""; - $scope.vm.hostingManager = ""; - $scope.vm.hostingTel = ""; - $scope.vm.hostingEmail = ""; - $scope.vm.hostingUrl = ""; - $scope.vm.hostingMemo = ""; + $scope.vm.hostingId = ""; + $scope.vm.hostingName = ""; + $scope.vm.hostingCode = ""; + $scope.vm.hostingManager = ""; + $scope.vm.hostingTel = ""; + $scope.vm.hostingEmail = ""; + $scope.vm.hostingUrl = ""; + $scope.vm.hostingMemo = ""; - if (ispFieldVo != null){ - $scope.vm.ispId = ispFieldVo.id; - $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; - } - if (hostingFieldVo != null){ - $scope.vm.hostingId = hostingFieldVo.id; - $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; + if (ispFieldVo != null) { + $scope.vm.ispId = ispFieldVo.id; + $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; + } + if (hostingFieldVo != null) { + $scope.vm.hostingId = hostingFieldVo.id; + $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) $scope.$on("ispFieldEvent", function (event, result) { - if ($rootScope.isDefined(result[0])) { + if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) { $scope.vm.ispId = result[0].id; $scope.vm.ispName = result[0].name; $scope.vm.ispCode = result[0].code; @@ -527,7 +528,7 @@ // �샇�뒪�똿�젙蹂� 寃곌낵 媛� Event 泥섎━(set) $scope.$on("hostingFieldEvent", function (event, result) { - if ($rootScope.isDefined(result[0])) { + if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) { $scope.vm.hostingId = result[0].id; $scope.vm.hostingName = result[0].name; $scope.vm.hostingCode = result[0].code; @@ -540,12 +541,12 @@ }); $scope.$on("companyTypeEvent", function (event, result) { - if ($rootScope.isDefined(result[0])) { + if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) { $scope.vm.form.companyTypeId = result[0].id; } }); $scope.$on("parentSectorEvent", function (event, result) { - if ($rootScope.isDefined(result[0])) { + if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) { $scope.vm.form.parentSectorId = result[0].id; } $scope.vm.form.childSectorId = ""; @@ -553,17 +554,17 @@ $scope.vm.form.childSectors = []; }); $scope.$on("childSectorEvent", function (event, result) { - if ($rootScope.isDefined(result[0])) { + if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) { $scope.vm.form.childSectorId = result[0].id; } }); $scope.$on("regionEvent", function (event, result) { - if ($rootScope.isDefined(result[0])) { + if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) { $scope.vm.form.regionId = result[0].id; } }); $scope.$on("statusEvent", function (event, result) { - if ($rootScope.isDefined(result[0])) { + if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) { $scope.vm.form.statusId = result[0].id; } }); -- Gitblit v1.8.0