From 3e3b289a1dbedd82bcb737db750d69d268ef412e Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 27 十月 2022 13:35:52 +0800
Subject: [PATCH] 解决部门bug
---
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index 4f02c6b..fc07da8 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -9,9 +9,7 @@
import com.ycl.api.BasePageVO;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.depart.DepartManager;
import com.ycl.entity.depart.UmsDepart;
-import com.ycl.entity.user.UmsDepartManage;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.utils.auth.UserAuthUtil;
@@ -126,19 +124,31 @@
@ApiOperation("鐢ㄦ埛淇敼瑙掕壊")
@PutMapping(value = "/user_update_Role")
public CommonResult userUpdateRole(@RequestParam Long id,
- @RequestParam List<Long> roles) {
+ @RequestParam List<Long> roles) {
umsAdminDepartService.userUpdateRoles(id, roles);
return CommonResult.success("update success");
}
@ApiOperation("鐢ㄦ埛淇敼閮ㄩ棬")
@PutMapping(value = "/user_update_depart")
- public CommonResult userUpdateDepart(@RequestParam Long id,
- @RequestParam List<UmsDepartManage> departmentIds) {
- umsAdminDepartService.userUpdateDepart(id, departmentIds);
+ public CommonResult userUpdateDepart(@RequestParam Long userId,
+ @RequestParam Long departId) {
+ umsAdminDepartService.userUpdateDepart(userId,departId);
return CommonResult.success("update success");
}
+ @ApiOperation("鏌ヨ涓嶅湪閮ㄩ棬鐨勫墿浣欎汉鍛�")
+ @GetMapping("/query_surplus_user")
+ public CommonResult searchSurplusUser() {
+ return CommonResult.success(departService.selectSurplusUser());
+ }
+
+ @ApiOperation("鏌ヨ涓嶅湪閮ㄩ棬鐨勫墿浣欎汉鍛樺拰宸插湪閮ㄩ棬鐨勪汉")
+ @GetMapping("/query_surplus_exist_user")
+ public CommonResult searchSurplusUser(@RequestParam Long id) {
+ return CommonResult.success(departService.selectSurplusUserAndExistUser(id));
+ }
+
@ApiOperation("鏌ヨ椤剁骇閮ㄩ棬")
@GetMapping(value = "/query_father")
public CommonResult search() {
--
Gitblit v1.8.0