部门修改

qirong

2023-10-27 3e6b676e210e22e4b7b4183d908dbca880093b86

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

@@ -5,7 +5,9 @@
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.domain.Department;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.UserDepartment;
import com.mindskip.xzs.domain.vo.DepartmentVO;
import com.mindskip.xzs.repository.UserDepartmentMapper;
import com.mindskip.xzs.service.DepartmentService;
import com.mindskip.xzs.service.UserService;
import com.mindskip.xzs.utility.PageInfoHelper;
@@ -26,11 +28,13 @@

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

    @Autowired
    public DepartmentController(DepartmentService departmentService, UserService userService) {
    public DepartmentController(DepartmentService departmentService, UserService userService, UserDepartmentMapper userDepartmentMapper) {
        this.departmentService = departmentService;
        this.userService = userService;
        this.userDepartmentMapper = userDepartmentMapper;
    }

    @RequestMapping(value = "/list", method = RequestMethod.POST)
@@ -75,7 +79,12 @@
        List<DepartmentVO> res = departmentService.gets()
                .stream().map(e->{
                    DepartmentVO departmentVO = new DepartmentVO();
                    departmentVO.setUserList(userService.getUserByLevel(e.getId()));
                    List<UserDepartment> userDepartments = userDepartmentMapper.selectByDepartmentId(e.getId());
                    List<User> list = new ArrayList<>();
                    for (UserDepartment userDepartment : userDepartments) {
                        list.add(userService.getUserById(userDepartment.getUserId()));
                    }
                    departmentVO.setUserList(list);
                    departmentVO.setDepartment(e);
                    return departmentVO;
                }).collect(Collectors.toList());