From 2c273d1072424a9363314fb258265cbf487f0297 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 16 12월 2021 17:48:46 +0900
Subject: [PATCH] - Excel Import 기능 담당부서도 들어가게 하기(기간 미지정 시에도 가능하도록 수정) - 이슈 통합검색 키워드에 업체,ISP,호스팅 정보도 포함 - 프로젝트에서 설정한 이슈유형만 보여주기

---
 src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
index 9b4576a..30b0a5b 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
@@ -84,14 +84,14 @@
                         name : $rootScope.preventXss($scope.vm.form.name),
                         ispId : (function () {  // ISP �븘�씠�뵒
                             var ispId = -1;
-                            if ($scope.vm.form.ispId != null) {
+                            if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0) {
                                 ispId = $scope.vm.form.ispId;
                             }
                             return ispId;
                         })(),
                         hostingId : (function () {  // Hosting �븘�씠�뵒
                             var hostingId = -1;
-                            if ($scope.vm.form.hostingId != null) {
+                            if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) {
                                 hostingId = $scope.vm.form.hostingId;
                             }
                             return hostingId;
@@ -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 {

--
Gitblit v1.8.0