From 248924e3a9e12125a850f8e3d457e4b1f49f348c Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 16 12월 2021 09:45:14 +0900
Subject: [PATCH] 사용자등급, 부서표시 추가

---
 src/main/webapp/scripts/app/issue/issueList.controller.js |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index ed3d50f..af4011a 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -47,6 +47,7 @@
 
                 //  蹂��닔
                 $scope.vm = {
+                    projectId : "",
                     issueTypeId : "",
                     partnerVos : "",
                     search : {
@@ -90,7 +91,8 @@
                     issueTableConfigs : [],  //  �씠�뒋 �뀒�씠釉� �꽕�젙
                     issueTreeConfigs : [],  //  �씠�뒋 �뀒�씠釉� �꽕�젙
                     parentIssueId : "",
-                    hideIssue : false,
+                    hideCompleteIssue : false,
+                    hideDownIssue : true,
                     listMode : 0, // 紐⑸줉 紐⑤뱶 0:湲곕낯 由ъ뒪�듃 1:�듃由ш뎄議� 由ъ뒪�듃
                 };
 
@@ -119,7 +121,6 @@
                 $scope.$on("searchIssueList", function (event, args) {
                     $scope.vm.search.keyWord = args.keyWord;
                     $scope.fn.getPageList(0);
-                    $rootScope.isMainSearch = false;
                 });
 
                 //  寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
@@ -441,7 +442,8 @@
                         endStartDate : "",
                         beginCompleteDate : "",
                         endCompleteDate : "",
-                        hideIssue : $scope.vm.hideIssue,
+                        hideCompleteIssue: $scope.vm.hideCompleteIssue,
+                        hideDownIssue : $scope.vm.hideDownIssue,
                         isTree : $scope.vm.listMode === 1,
                         projectIds : (function () {
                             var projectIds = [];
@@ -574,8 +576,12 @@
                         selectedPage = 0;
                     }
 
-                    if ($scope.vm.hideIssue) {
-                        $scope.vm.hideIssue = true;
+                    if ($scope.vm.hideCompleteIssue) {
+                        $scope.vm.hideCompleteIssue = true;
+                    }
+
+                    if ($scope.vm.hideDownIssue) {
+                        $scope.vm.hideDownIssue = true;
                     }
                     //  �쁽�옱 �럹�씠吏� �젙蹂�
                     var currentPage = 0;
@@ -623,6 +629,21 @@
                         $resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
 
                         if (result.data.message.status === "success") {
+                            if (result.data.data !=  null && result.data.data.length > 0) {
+                                //var resultSize = result.data.data.length;
+                                for (var i = 0; i < result.data.data.length; i++) {
+                                    /*if (result.data.data[i].parentIssueId != null) {//�븯�쐞�씠�뒋�뒗 由ъ뒪�듃�뿉�꽌 �궘�젣
+                                        result.data.data.splice(i, 1);
+                                        i--;
+                                    }else*/
+                                    if ($scope.vm.search.issueTypeIds !== null && $scope.vm.search.issueTypeIds.length > 0
+                                                && result.data.data[i].issueTypeId !== $scope.vm.search.issueTypeIds[0].fieldKey) { //�씠�뒋���엯 泥댄겕
+                                        result.data.data.splice(i, 1);
+                                        i--;
+                                    }
+                                }
+                            }
+
                             if (result.data.data !=  null && result.data.data.length > 0) {
                                 $scope.vm.issueTypeId = result.data.data[0].issueTypeId;
                                 $scope.vm.projectKey = result.data.data[0].projectKey;
@@ -722,6 +743,7 @@
                     angular.forEach($scope.vm.responseData.data, function (data) {
                         if (data.checked) {
                             issueIds.push(data.id);
+                            $scope.vm.projectId = data.projectId;
                         }
                     });
 
@@ -738,7 +760,8 @@
                         resolve : {
                             parameter : function () {
                                 return {
-                                    issueIds : issueIds
+                                    issueIds : issueIds,
+                                    projectId : $scope.vm.projectId
                                 };
                             }
                         }

--
Gitblit v1.8.0