From 8640de04cd67d3fa33ca188d6b45ed1a13d17386 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 목, 11 11월 2021 09:25:01 +0900 Subject: [PATCH] 사용자 관리 부서 상세 백앤드 수정 --- src/main/webapp/scripts/components/utils/autoComplete.controller.js | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js index 4e36089..c5586e9 100644 --- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js +++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js @@ -18,6 +18,7 @@ var Project = $injector.get("Project"); var Workflow = $injector.get("Workflow"); var Issue = $injector.get("Issue"); + var UserWorkspace = $injector.get("UserWorkspace"); var $log = $injector.get("$log"); var SweetAlert = $injector.get("SweetAlert"); @@ -26,6 +27,7 @@ $scope.fn.getProjectList = getProjectList; // �봽濡쒖젥�듃 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎. $scope.fn.getIssueList = getIssueList; // �씪媛� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎. $scope.fn.getWorkflowList = getWorkflowList; // �썙�겕�뵆濡쒖슦 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎. + $scope.fn.getUserDepartmentList = getUserDepartmentList; // 遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎. function getUserList(query, excludeList, page, callBack) { var conditions = { @@ -109,6 +111,38 @@ return deferred.promise; } + function getUserDepartmentList(query, excludeList, page, callBack) { //泥댄겕 �븘�슂 + var conditions = { + departmentName : query, + excludeIds : (function () { //�뼱�뼡 �뿭�븷? 泥댄겕 �븘�슂 + var excludeIds = []; + angular.forEach(excludeList, function (exclude) { + excludeIds.push(exclude.id); + }); + + return excludeIds; + })() + }; + var deferred = $q.defer(); + + UserWorkspace.userDepartmentDetail($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)) { + callBack(result); + } + + deferred.resolve(result.data.data); + } + else { + SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message, "error"); // "遺��꽌 紐⑸줉 議고쉶 �떎�뙣" + } + }); + + return deferred.promise; + } + function getWorkflowList(query, excludeList, page, callBack) { var conditions = { name : query, -- Gitblit v1.8.0