From 4aff300135c65fbbfb2d55b01f4820cd6861a5da Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 08 12월 2021 20:20: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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..cc4d354 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -315,7 +315,15 @@
function getIssueDepartmentList(query, excludeList, page, callBack) {
var conditions = {
//issueTypeId : $scope.vm.form.issueTypeId,
- issueTypeId : $rootScope.currentDetailIssueId,
+ 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 () {
--
Gitblit v1.8.0