From 9f7091d2bf6e1353e3e747f3db49a0b933c2bd1d Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 11 11월 2021 21:38:10 +0900
Subject: [PATCH] 사용자 관리 부서 상세 백앤드 수정
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index 4bfe49f..bc694ec 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -27,7 +27,7 @@
$scope.fn.getProjectList = getProjectList; // �봽濡쒖젥�듃 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getIssueList = getIssueList; // �씪媛� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getWorkflowList = getWorkflowList; // �썙�겕�뵆濡쒖슦 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.getDepartmentList = getDepartmentList; // 遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+ $scope.fn.getUserDepartmentList = getUserDepartmentList; // 遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
function getUserList(query, excludeList, page, callBack) {
var conditions = {
@@ -111,22 +111,11 @@
return deferred.promise;
}
- function getDepartmentList(query, excludeList, page, callBack) {
+ function getUserDepartmentList(query, excludeList, page, callBack) {
var conditions = {
departmentName : query,
- userId : (function () {
- var userId = "";
-
- if ($rootScope.isDefined($scope.vm.form)) {
- angular.forEach($scope.vm.form.users, function (user) {
- userId = user.id;
- });
- }
- return userId;
- })(),
- excludeIds : (function () { //�뼱�뼡 �뿭�븷?
+ excludeIds : (function () { //excludeIds : �젣�쇅 �븷 由ъ뒪�듃
var excludeIds = [];
-
angular.forEach(excludeList, function (exclude) {
excludeIds.push(exclude.id);
});
@@ -136,21 +125,19 @@
};
var deferred = $q.defer();
- UserWorkspace.find($resourceProvider.getContent( // �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
+ UserWorkspace.departmentFind($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);
+ deferred.resolve(result.data.data); //�궗�슜�옄媛� �냽�빐�졇�엳�뒗 遺��꽌 由ъ뒪�듃瑜� 遺덈윭�샂
}
else {
SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message, "error"); // "遺��꽌 紐⑸줉 議고쉶 �떎�뙣"
}
});
-
return deferred.promise;
}
--
Gitblit v1.8.0