From 7b4b71ee33c7a42383d3e6a69885d521fd7b6688 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 수, 08 12월 2021 17:25:23 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/scripts/components/utils/autoComplete.controller.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js index 8e9cbc3..a1570a5 100644 --- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js +++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js @@ -314,7 +314,8 @@ function getIssueDepartmentList(query, excludeList, page, callBack) { var conditions = { - issueTypeId : $scope.vm.form.issueTypeId, + //issueTypeId : $scope.vm.form.issueTypeId, + issueTypeId : $rootScope.currentDetailIssueId, departmentName : query, userId : $rootScope.user.id, projectId : (function () { @@ -347,7 +348,7 @@ conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) { if (result.data.message.status === "success") { const departments = result.data.data; - if(departments != null && departments.length() > 0){ + if(departments != null){ var filterDepartments = departments.filter(function(item, idx){ return departments.findIndex(function(item2, idx2){ return item.departmentName === item2.departmentName -- Gitblit v1.8.0