From 17a9cb0fc114804ab81cb1eaa2dd5919a0194dd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 15:30:55 +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 | 13 +++++++++++--
1 files changed, 11 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..cc4d354 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -314,7 +314,16 @@
function getIssueDepartmentList(query, excludeList, page, callBack) {
var conditions = {
- issueTypeId : $scope.vm.form.issueTypeId,
+ //issueTypeId : $scope.vm.form.issueTypeId,
+ issueTypeId : (function () {
+ var issueTypeId = "";
+ if ($rootScope.currentDetailIssueId != null) {
+ issueTypeId = $rootScope.currentDetailIssueId;
+ } else {
+ issueTypeId = $scope.vm.form.issueTypeId;
+ }
+ return issueTypeId;
+ })(),
departmentName : query,
userId : $rootScope.user.id,
projectId : (function () {
@@ -347,7 +356,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