From 06643b1e80b82d88f7aeb475a412c67dd5a59b36 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 14 12월 2021 15:00:55 +0900
Subject: [PATCH] - api 입력시 등록자 정보가 안바뀌는 오류 수정 - 전체 검색시 페이지 벗어날 경우에만 기본 프로젝트/이슈타입 설정하도록 수정

---
 src/main/webapp/scripts/app/issue/issueAdd.controller.js |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 5dbac8d..7255a12 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -69,6 +69,7 @@
                     companyManager : "",   // �뾽泥� �떞�떦�옄
                     companyTel : "",  // �뾽泥� �쟾�솕踰덊샇
                     companyEmail : "",  // �뾽泥� �씠硫붿씪
+                    companyUrl : "",  // �뾽泥� url
                     companyMemo : "",  // �뾽泥� 鍮꾧퀬
                     ispId : -1, // ISP ID
                     ispName : "", // ISP 紐�
@@ -76,12 +77,14 @@
                     ispManager : "", // ISP �떞�떦�옄
                     ispTel : "", // ISP �쟾�솕踰덊샇
                     ispEmail : "", // ISP �씠硫붿씪
+                    ispUrl : "",  // url
                     ispMemo : "", // ISP 鍮꾧퀬
                     hostingId : -1, // �샇�뒪�똿 ID
                     hostingName : "", // �샇�뒪�똿紐� 寃��깋
                     hostingManager : "", // �샇�뒪�똿 �떞�떦�옄
                     hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇
                     hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪
+                    hostingUrl : "",  // url
                     hostingMemo :"", // �샇�뒪�똿 鍮꾧퀬
 
                     autoCompletePage : {
@@ -385,16 +388,35 @@
 
                 // �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
                 $scope.$on("companyFieldEvent", function (event, result) {
+                    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.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 = 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;
@@ -402,6 +424,7 @@
                     $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;
                 });
 
@@ -413,6 +436,7 @@
                     $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;
                 });
 
@@ -440,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;
@@ -448,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;
@@ -456,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;
@@ -506,6 +530,7 @@
                                     manager : $scope.vm.companyManager,
                                     tel : $scope.vm.companyTel,
                                     email :$scope.vm.companyEmail,
+                                    url :$scope.vm.companyUrl,
                                     memo : $scope.vm.companyMemo
                                 });
                             }
@@ -526,6 +551,7 @@
                                     manager : $scope.vm.ispManager,
                                     tel : $scope.vm.ispTel,
                                     email :$scope.vm.ispEmail,
+                                    url :$scope.vm.ispUrl,
                                     memo : $scope.vm.ispMemo
                                 };
 
@@ -548,6 +574,7 @@
                                     manager : $scope.vm.hostingManager,
                                     tel : $scope.vm.hostingTel,
                                     email :$scope.vm.hostingEmail,
+                                    url :$scope.vm.hostingUrl,
                                     memo : $scope.vm.hostingMemo
                                 };
                             }
@@ -728,7 +755,6 @@
                                         });
                                         break;
                                 }
-
                                 $scope.vm.form.issueCustomFields.push(issueTypeCustomField);
                             });
                         }

--
Gitblit v1.8.0