From a60bb0e8535ebc639f59f22faa73da7c77ce89c8 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 화, 14 12월 2021 09:43:07 +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 | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js index a1570a5..638c1dd 100644 --- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js +++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js @@ -133,13 +133,13 @@ function getIssueList(query, issueTypeId, excludeList, page, callBack) { var conditions = { name : query, - issueTypeIds : (function () { + /*issueTypeIds : (function () { var ids = []; ids.push(issueTypeId); return ids; - })(), + })(),*/ excludeIds : (function () { var excludeIds = []; @@ -175,13 +175,13 @@ function getDownIssueList(query, issueTypeId, excludeList, page, callBack) { var conditions = { name : query, - // issueTypeIds : (function () { - // var ids = []; - // - // ids.push(issueTypeId); - // - // return ids; - // })(), + issueTypeIds : (function () { + var ids = []; + + ids.push(issueTypeId); + + return ids; + })(), excludeIds : (function () { var excludeIds = []; @@ -312,10 +312,10 @@ return deferred.promise; } - function getIssueDepartmentList(query, excludeList, page, callBack) { + function getIssueDepartmentList(issueTypeId, query, excludeList, page, callBack) { var conditions = { //issueTypeId : $scope.vm.form.issueTypeId, - issueTypeId : $rootScope.currentDetailIssueId, + issueTypeId : issueTypeId, departmentName : query, userId : $rootScope.user.id, projectId : (function () { -- Gitblit v1.8.0