From f87d487fcaddec01fe5a9d860f75fa691618cf78 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 11 11월 2021 16:12:00 +0900
Subject: [PATCH] 사용자의 부서 수정 기능 프론트

---
 src/main/webapp/scripts/components/utils/autoComplete.controller.js           |    8 +++-----
 src/main/webapp/views/workspace/workspaceDepartmentModify.html                |    4 ++--
 src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js |    9 ++++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
index 2a4e97f..6129ec0 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentModify.controller.js
@@ -38,7 +38,7 @@
 
                 //  �꽑�깮 �븳 遺��꽌 �젣嫄�
                 function removeDepartments(index) {
-                    $scope.vm.form.departments.splice(index, 1);
+                    $scope.vm.form.departmentList.splice(index, 1);
                 }
 
                 function formCheck(formInvalid) {
@@ -55,7 +55,7 @@
 
                     var content = {
                         id : $scope.vm.form.id,
-                        departmentName : (function () {
+                        departmentId : (function () {
                             var departmentIds = [];
                             angular.forEach($scope.vm.form.departments, function (department) {
                                 departmentIds.push(department.id);
@@ -64,7 +64,6 @@
                         })()
                     };
 
-                    //user_department INSERT �슂泥�
                     UserWorkspace.userDepartmentModify($resourceProvider.getContent(
                         content,
                         $resourceProvider.getPageContent(0, 0))).then(function (result) {
@@ -95,13 +94,13 @@
                         id : parameter.id
                     }
 
-                    UserWorkspace.userDepartmentDetail($resourceProvider.getContent(
+                    UserWorkspace.userDepartmentDetail($resourceProvider.getContent(//test
                         contents,
                         $resourceProvider.getPageContent(0, 1))).then(function (result) {
 
                         if (result.data.message.status === "success") {
                             if (angular.isDefined(result.data.data)) {
-                                $scope.vm.form.departmentList = result.data.data; //泥댄겕 �븘�슂
+                                $scope.vm.form.departmentList = result.data.data; //泥댄겕 �븘
                             }
                         }
                         else {
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index c5586e9..4e7ca2f 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -111,10 +111,10 @@
                     return deferred.promise;
                 }
 
-                function getUserDepartmentList(query, excludeList, page, callBack) { //泥댄겕 �븘�슂
+                function getUserDepartmentList(query, excludeList, page, callBack) {
                     var conditions = {
                         departmentName : query,
-                        excludeIds : (function () { //�뼱�뼡 �뿭�븷? 泥댄겕 �븘�슂
+                        excludeIds : (function () { //excludeIds : �젣�쇅 �븷 由ъ뒪�듃
                             var excludeIds = [];
                             angular.forEach(excludeList, function (exclude) {
                                 excludeIds.push(exclude.id);
@@ -132,14 +132,12 @@
                             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;
                 }
 
diff --git a/src/main/webapp/views/workspace/workspaceDepartmentModify.html b/src/main/webapp/views/workspace/workspaceDepartmentModify.html
index be907bd..697f309 100644
--- a/src/main/webapp/views/workspace/workspaceDepartmentModify.html
+++ b/src/main/webapp/views/workspace/workspaceDepartmentModify.html
@@ -22,8 +22,8 @@
 
 
                 <div class="select3-selection__choicediv mt-10">
-                    <span class="select3-selection__choice" ng-repeat="department in vm.form.departments">
-                        <span>{{department.name}}</span> <!--遺��꽌 �씠由� 異쒕젰-->
+                    <span class="select3-selection__choice" ng-repeat="department in vm.form.departmentList">
+                        <span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
                         <span class="select3-selection__choice__remove" ng-click="fn.removeDepartments($index)">횞</span>
                     </span>
                 </div>

--
Gitblit v1.8.0