Merge remote-tracking branch 'origin/master'

jhjang

2021-11-10 43a910170d8049ef99ba38cc2a81b99cad89fb0d

 src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js

@@ -34,31 +34,31 @@
            
            //부서 관리
            departmentFind : function (conditions) {
                return $http.post("departmentManage/find", conditions).then(function (response) {
                return $http.post("department/find", conditions).then(function (response) {
                    $log.debug("부서 목록 : ", response);
                    return response;
                });
            },
            departmentDetail : function (conditions) {
                return $http.post("departmentManage/detail", conditions).then(function (response) {
                return $http.post("department/detail", conditions).then(function (response) {
                    $log.debug("부서 상세 : ", response);
                    return response;
                });
            },
            departmentAdd : function (conditions) {
                return $http.post("departmentManage/add", conditions).then(function (response) {
                return $http.post("department/add", conditions).then(function (response) {
                    $log.debug("부서 생성 결과 : ", response);
                    return response;
                });
            },
            departmentModify : function (conditions) {
                return $http.post("departmentManage/modify", conditions).then(function (response) {
                return $http.post("department/modify", conditions).then(function (response) {
                    $log.debug("부서 수정 결과 : ", response);
                    return response;
                });
            },
            departmentRemove : function (conditions) {
                return $http.post("departmentManage/remove", conditions).then(function (response) {
                return $http.post("department/remove", conditions).then(function (response) {
                    $log.debug("부서 삭제 결과 : ", response);
                    return response;
                });
@@ -77,6 +77,18 @@
                    return response;
                });
            },
            userDepartmentModify : function (conditions) {
                return $http.post("userWorkspace/modifyDepartment", conditions).then(function (response) {
                    $log.debug("사용자의 부서 수정 결과 : ", response);
                    return response;
                });
            },
            userDepartmentDetail : function (conditions) {
                return $http.post("userWorkspace/detailDepartment", conditions).then(function (response) {
                    $log.debug("사용자의 부서 상세보기 결과 : ", response);
                    return response;
                });
            },
            modify : function (conditions) {
                return $http.post("userWorkspace/modify", conditions).then(function (response) {
                    $log.debug("참여 상태 수정 결과 : ", response);