From 98346d0dd97e0001ebfe7eb2c791c9d83c63bdd8 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 09:25:30 +0900
Subject: [PATCH] "전체이슈" 일 경우 이슈 상세페이지에서 연관이슈 및 하위이슈 새로 추가 시 오류 수정

---
 src/main/webapp/scripts/app/issue/issueAddDown.controller.js |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
index 5c4df4a..a549fc0 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
@@ -39,6 +39,7 @@
                     containsPartner : containsPartner,
                     getPartners : getPartners,
                     addDownIssue : addDownIssue,
+                    getDepartments : getDepartments,
                 };
 
                 $scope.vm = {
@@ -51,7 +52,7 @@
                         issueCompanyFields : [], // �뾽泥댁젙蹂�
                         issueIspFields : [], // ISP �젙蹂�
                         issueHostingFields : [], // �샇�뒪�똿�젙蹂�
-                        issueTypeId : "",   //  �씠�뒋 �쑀�삎 �븘�씠�뵒
+                        issueTypeId : parameter.issueTypeId,   //  �씠�뒋 �쑀�삎 �븘�씠�뵒
                         priorityId : "",    //  �슦�꽑�닚�쐞 �븘�씠�뵒
                         severityId : "",    //  以묒슂�룄 �븘�씠�뵒
                         users : [],     //  �떞�떦�옄
@@ -701,12 +702,16 @@
                         SweetAlert.error($filter("translate")("issue.errorSelectRelationIssue"), "");
                         return;
                     }*/
+                    var ids = [];
+                    if (downId != null) {
+                        ids.push(downId);
+                    }
 
                     var contents = {
                         //relationIssueType : $scope.vm.form.relationIssueTypeId,
                         // issueId : $rootScope.currentDetailIssueId,
                         issueId :  parameter.id,
-                        id : downId,
+                        ids : ids,
                         parentIssueId : parameter.id
                     };
 
@@ -910,6 +915,26 @@
 
                 }
 
+                function getDepartments() {
+                    if($scope.vm.form.issueTypeId === ""){
+                        $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
+                    }
+                    var content = {
+                        issueTypeId : $scope.vm.form.issueTypeId,
+                    };
+                    Issue.findReadyDepartments($resourceProvider.getContent(
+                        content,
+                        $resourceProvider.getPageContent(0, 1))).then(function (result) {
+                        if (result.data.message.status === "success") {
+                            angular.forEach(result.data.data, function (department) {
+                                department.byName = department.departmentName;
+                                $scope.vm.form.departments.push(department);
+                            });
+                        }
+                    });
+
+                }
+
                 //  理쒖큹 �떎�뻾
                 function startExecute() {
 
@@ -917,7 +942,8 @@
                         getIssueTypes : $scope.fn.getIssueTypes(),
                         getPriorities : $scope.fn.getPriorities(),
                         getSeverities : $scope.fn.getSeverities(),
-                        getPartners : $scope.fn.getPartners()
+                        getPartners : $scope.fn.getPartners(),
+                        getDepartments : $scope.fn.getDepartments()
                     };
                     $q.all(promises).then(function (results) {
                         // �쁽�옱 �봽濡쒖젥�듃 �꽕�젙
@@ -930,6 +956,8 @@
                         var id = $rootScope.getCurrentIssueTypeId();
                         if (id != null) {
                             $scope.vm.form.issueTypeId = id.toString();
+                        } else {
+                            $scope.vm.form.issueTypeId = parameter.issueTypeId.toString();
                         }
                         $log.debug("promises 寃곌낵 ", results);
                     });

--
Gitblit v1.8.0