bug：学员有状态不能修改问题

xiangpei

2025-05-14 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403

 src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java

@@ -1,6 +1,5 @@
package com.mindskip.xzs.controller.admin;

import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.domain.Department;
@@ -8,6 +7,7 @@
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.UserDepartment;
import com.mindskip.xzs.domain.vo.BaseSelect;
import com.mindskip.xzs.domain.vo.CascaderDataVO;
import com.mindskip.xzs.domain.vo.DepartmentVO;
import com.mindskip.xzs.domain.vo.UpdateDeptAdminVO;
import com.mindskip.xzs.repository.DepartmentMapper;
@@ -30,13 +30,10 @@
@RequiredArgsConstructor
public class DepartmentController extends BaseApiController {


    private final DepartmentService departmentService;
    private final UserService userService;
    private final UserDepartmentMapper userDepartmentMapper;
    private final DepartmentMapper departmentMapper;



    /**
     * 获取部门下用户列表(下拉)
@@ -64,14 +61,14 @@


    @RequestMapping(value = "/page/list", method = RequestMethod.POST)
    public RestResponse<PageInfo<DepartmentResponseVM>> pageList(@RequestBody DepartmentResponseVM model) {
        PageInfo<DepartmentResponseVM> pageInfo = departmentService.gets(model);
    public RestResponse<List<DepartmentResponseVM>> pageList(@RequestBody DepartmentResponseVM model) {
        List<DepartmentResponseVM> pageInfo = departmentService.gets(model);
        return RestResponse.ok(pageInfo);
    }

    @RequestMapping(value = "/add", method = RequestMethod.POST)
    public RestResponse add(@RequestBody @Valid String  name) {
        return RestResponse.ok(departmentService.add(name));
    public RestResponse add(@RequestBody @Valid Department  model) {
        return RestResponse.ok(departmentService.add(model));
    }

    @RequestMapping(value = "/update", method = RequestMethod.POST)
@@ -81,7 +78,7 @@

    @RequestMapping(value = "/get/{id}", method = RequestMethod.POST)
    public RestResponse update(@PathVariable Integer id) {
        return RestResponse.ok(departmentService.getById(id));
        return RestResponse.ok(departmentService.getByIdVO(id));
    }

    @RequestMapping(value = "/getUserByDepartment/{id}", method = RequestMethod.POST)
@@ -149,7 +146,17 @@

    @RequestMapping(value = "/getDeptAdmins", method = RequestMethod.GET)
    public RestResponse<List<Department>> getDeptAdmins(){
        return RestResponse.ok(userService.getDeptAdmins(isDeptAdmin() ? getCurrentUser().getId() : null));
        return RestResponse.ok(userService.getDeptAdmins(isDeptAdmin() ? getAdminDeptIds() : null));
    }

    @GetMapping("/cascader")
    public RestResponse<List<CascaderDataVO>> cascader(){
        return RestResponse.ok(departmentService.cascader());
    }

    @GetMapping("/getCurrentDeptId")
    public RestResponse<List<Integer>> getCurrentDeptIds(){
        return RestResponse.ok(getAdminDeptIds());
    }

}