From 171d9bc308a76fba7ddd78acd1871af3a2a107c7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 10 1월 2022 11:47:41 +0900
Subject: [PATCH] 이슈 수정 시 isp/호스팅 목록에 같은게 추가되는 현상 해결

---
 src/main/webapp/scripts/app/issue/issueModify.controller.js |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index c11d506..957c2d0 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -572,11 +572,11 @@
 
                         issueIspFields : (function () {
                             var issueIspFields = [];
-                            if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
-                                var ispField = $scope.vm.form.issueIspFields[0];
+                            if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
+                                && $scope.vm.form.issueCompanyFields[0].ispFieldVo != null
+                                || $scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
 
                                 issueIspFields.push({
-                                    id : ispField.id,
                                     ispId : $scope.vm.ispId,
                                     code : $scope.vm.ispCode,
                                     name : $scope.vm.ispName,
@@ -594,12 +594,11 @@
 
                         issueHostingFields : (function () {
                             var issueHostingFields = [];
-                            if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
-
-                                var hostingField = $scope.vm.form.issueHostingFields[0];
+                            if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
+                                && $scope.vm.form.issueCompanyFields[0].hostingFieldVo != null
+                                || $scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
 
                                 issueHostingFields.push({
-                                    id : hostingField.id,
                                     hostingId : $scope.vm.hostingId,
                                     name : $scope.vm.hostingName,
                                     code : $scope.vm.hostingCode,
@@ -846,8 +845,8 @@
 
                 //  �씠�뒋 �긽�꽭 �젙蹂�
                 function detail() {
+                    $rootScope.spinner = true;
                     var deferred = $q.defer();
-
                     Issue.detail($resourceProvider.getContent(
                         $scope.vm.search,
                         $resourceProvider.getPageContent(0, 1))).then(function (result) {
@@ -922,10 +921,9 @@
                         else {
                             SweetAlert.error($filter("translate")("issue.failedToProjectDetails"), result.data.message.message); // �봽濡쒖젥�듃 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣
                         }
-
+                        $rootScope.spinner = false;
                         deferred.resolve(result.data.data);
                     });
-
                     return deferred.promise;
                 }
 

--
Gitblit v1.8.0