From a00047ce04e06bb99a637b8b02ec4bf2b4fdd25c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 10 11월 2021 16:26:37 +0900
Subject: [PATCH] 사용자의 부서 수정 기능 프론트 작업 수정
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 15 ++-------------
src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js | 2 +-
src/main/java/kr/wisestone/owl/service/impl/WorkflowServiceImpl.java | 2 +-
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/WorkflowServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/WorkflowServiceImpl.java
index 3ccc637..5f72e5d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WorkflowServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WorkflowServiceImpl.java
@@ -170,7 +170,7 @@
List<Map<String, Object>> results = this.workflowMapper.find(condition);
Long totalCount = this.workflowMapper.count(condition);
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
- List<WorkflowVo> workflowVos = ConvertUtil.convertListToListClass(results, WorkflowVo.class);
+ List<WorkflowVo> workflowVos = ConvertUtil.convertListToListClass(results, WorkflowVo.class); //workflow 由ъ뒪�듃
// �썙�겕�뵆濡쒖슦瑜� �궗�슜�븯�뒗 �씠�뒋 �쑀�삎 �젙蹂대�� 異붽��븳�떎.
this.setIssueTypeVos(workflowVos);
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
index 0185ac6..a50f8dd 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
@@ -92,7 +92,7 @@
function detail() {
UserWorkspace.userDepartmentDetail($resourceProvider.getContent(
- $scope.vm.search,
+ $scope.vm,
$resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index 4bfe49f..9d9531c 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -111,22 +111,11 @@
return deferred.promise;
}
- function getDepartmentList(query, excludeList, page, callBack) {
+ function getDepartmentList(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 () { //�뼱�뼡 �뿭�븷? 泥댄겕 �븘�슂
var excludeIds = [];
-
angular.forEach(excludeList, function (exclude) {
excludeIds.push(exclude.id);
});
--
Gitblit v1.8.0