Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-17 abdd896a66eced1355a24ea5eabbee497a745fe5

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

@@ -52,7 +52,7 @@

    @RequestMapping(value = "/page/list", method = RequestMethod.POST)
    public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
        model.setDepartmentId(isDeptAdmin() ? getAdminDeptIds() : null);
        model.setDepartmentId(ObjectUtils.isNotEmpty(model.getDepartmentId()) ? model.getDepartmentId() : getAdminDeptIds());
        PageInfo<User> pageInfo = userService.userPage(model);
        PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d ->
                UserResponseVM.from(d));