오류 메시지 수정 및 버그 수정

이민희

2021-11-08 524dc660327c6cdd6eb20ef5d2feb4afd9c3db00

 src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js

@@ -36,7 +36,6 @@
                        fieldValue : $filter("translate")("managementWorkspace.participation") // "참여"
                    }, {
                        fieldKey : "N",
                        //fieldValue : $filter("translate")("managementWorkspace.waitForParticipation") // "참여대기"
                        fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "탈퇴"
                    }]
                };
@@ -47,6 +46,7 @@
                };

                $scope.vm.levels = [];
                $scope.vm.departments = [];
                $scope.vm.tableConfigs = [];
                $scope.vm.responseData = {
                    data : []
@@ -56,7 +56,7 @@
                $scope.vm.tableEvent = {
                    modifyUserWorkspace : modifyUserWorkspace,   //  업무 공간 참여하는 사용자의 참여 상태 변경
                    modifyLevel : modifyLevel,   //  사용자 등급명 변경
                    //modifyDepartment : modifyDepartment //  부서 변경
                    departmentModify : departmentModify //  부서 변경
                };

                //  사용자 등급 수정
@@ -65,6 +65,24 @@
                        templateUrl : 'views/workspace/workspaceLevelModify.html',
                        size : "md",
                        controller : 'levelModifyController',
                        backdrop : 'static',
                        resolve : {
                            parameter : function () {
                                return {
                                    id : id,
                                    //levelName : [$scope.vm.form.]
                                };
                            }
                        }
                    });
                }

                //  부서 수정
                function departmentModify(id) {
                    $uibModal.open({
                        templateUrl : 'views/workspace/workspaceDepartmentModify.html',
                        size : "md",
                        controller : 'departmentModifyController',
                        backdrop : 'static',
                        resolve : {
                            parameter : function () {
@@ -181,7 +199,7 @@

                            return statuses;
                        })(),
                        levels : (function () {
                        levelIds : (function () {
                            var levels = [];

                            angular.forEach($scope.vm.search.levels, function (level) {
@@ -190,7 +208,7 @@

                            return levels;
                        })(),
                        departments : (function () {
                        departmentIds : (function () {
                            var departments = [];

                            angular.forEach($scope.vm.search.departments, function (department) {
@@ -210,11 +228,19 @@

                            var idx = 0;
                            angular.forEach($scope.vm.responseData.data, function (data) {
                                data.levelId = 3; /*$scope.vm.levels[idx].id;*/
                                // data.levelId = $scope.vm.levels[idx].fieldKey;
                                //data.department = $scope.vm.departments[idx];

                                data.levels = [];
                                data.departments = [];
                                data.levels = $scope.vm.levels.slice();
                                data.departments = $scope.vm.departments.slice();
                                idx++;
                            });
                            /*if(result.data.data[idx-1].departmentId == 0){
                                //console.log($scope.vm.tableConfigs);
                                //result.data.data[idx-1].department.fieldValue = '부서를 선택 하세요.';
                            }*/
                        }
                        else {
                            SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "업무 공간 전체 사용자 목록 조회 실패"
@@ -231,7 +257,6 @@
                        $resourceProvider.getPageContent(0, 1000))).then(function (result) {

                        if (result.data.message.status === "success") {
                            $scope.vm.search.levels = result.data.data;
                            angular.forEach(result.data.data, function (level) {
                                $scope.vm.levels.push({
                                    fieldKey : level.id,
@@ -240,7 +265,7 @@
                            });
                        }
                        else {
                            SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // 업무 공간 전체 사용자 목록 조회 실패
                            SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullLevelList"), result.data.message.message, "error"); // 용자 등급 목록 조회 실패
                        }

                        deferred.resolve(result.data.data);
@@ -252,12 +277,12 @@
                // 부서 목록
                function getDepartments() {
                    var deferred = $q.defer();
                    $scope.vm.departments = [];

                    UserWorkspace.departmentFind($resourceProvider.getContent({},
                        $resourceProvider.getPageContent(0, 1000))).then(function (result) {

                        if (result.data.message.status === "success") {
                            $scope.vm.search.departments = result.data.data;
                            angular.forEach(result.data.data, function (department) {
                                $scope.vm.departments.push({
                                    fieldKey : department.id,
@@ -266,7 +291,7 @@
                            });
                        }
                        else {
                            SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // 업무 공간 전체 사용자 목록 조회 실패
                            SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message, "error"); // 부서 목록 조회 실패
                        }

                        deferred.resolve(result.data.data);