From fd569a1654c1aacc1228d0650cd4b0dd90748328 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 19 11월 2021 16:53:40 +0900
Subject: [PATCH] 이슈 - 담당부서 리스트 프로젝트에서 설정한 부서들만 보여지도록 수정
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index 3d9aed3..b2177a0 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -31,10 +31,10 @@
$scope.fn.getIssueList = getIssueList; // �씪媛� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getWorkflowList = getWorkflowList; // �썙�겕�뵆濡쒖슦 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getUserDepartmentList = getUserDepartmentList; // 遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.getCompanyFieldList = getCompanyFieldList; // �뾽泥� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+ $scope.fn.getIssueCompanyFieldList = getIssueCompanyFieldList; // �뾽泥� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getIssueDepartmentList = getIssueDepartmentList; // �떞�떦�옄 -> �떞�떦遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.getIspFieldList = getIspFieldList; // ISP 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.getHostingFieldList = getHostingFieldList; // �샇�뒪�똿 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+ $scope.fn.getIssueIspFieldList = getIssueIspFieldList; // ISP 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+ $scope.fn.getIssueHostingFieldList = getIssueHostingFieldList; // �샇�뒪�똿 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
function getUserList(query, excludeList, page, callBack) {
var conditions = {
@@ -191,7 +191,6 @@
function getUserDepartmentList(query, excludeList, page, callBack) {
var conditions = {
departmentName : query,
- departmentId : $rootScope.department.id,
excludeIds : (function () { //excludeIds : �젣�쇅 �븷 由ъ뒪�듃
var excludeIds = [];
angular.forEach(excludeList, function (exclude) {
@@ -219,7 +218,7 @@
return deferred.promise;
}
- function getCompanyFieldList(query, excludeList, page, callBack) {
+ function getIssueCompanyFieldList(query, excludeList, page, callBack) {
var conditions = {
companyName : query,
excludeIds : (function () {
@@ -258,6 +257,17 @@
var conditions = {
departmentName : query,
userId : $rootScope.user.id,
+ projectId : (function () {
+ var projectId = "";
+
+ if ($rootScope.isDefined($scope.vm.form)) {
+ angular.forEach($scope.vm.form.projects, function (project) {
+ projectId = project.id;
+ });
+ }
+
+ return projectId;
+ })(),
excludeIds : (function () {
var excludeIds = [];
@@ -273,7 +283,7 @@
- UserWorkspace.departmentFind($resourceProvider.getContent( // �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
+ UserWorkspace.findProjectDepartment($resourceProvider.getContent( // �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
if (result.data.message.status === "success") {
if ($rootScope.isDefined(callBack)) {
@@ -290,7 +300,7 @@
return deferred.promise;
}
- function getIspFieldList(query, excludeList, page, callBack) {
+ function getIssueIspFieldList(query, excludeList, page, callBack) {
var conditions = {
ispName : query,
excludeIds : (function () {
@@ -325,7 +335,7 @@
return deferred.promise;
}
- function getHostingFieldList(query, excludeList, page, callBack) {
+ function getIssueHostingFieldList(query, excludeList, page, callBack) {
var conditions = {
hostingName : query,
excludeIds : (function () {
--
Gitblit v1.8.0