解决部门bug

wl

2022-10-27 3e3b289a1dbedd82bcb737db750d69d268ef412e

 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;
@@ -133,12 +131,24 @@

    @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() {