#

luxiaotao1123

2024-09-09 79e47c9ee6b668d0a0c1fa041d4683d86c97a297

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java

@@ -6,6 +6,7 @@
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.domain.PageResult;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.system.controller.param.ResetPwdParam;
import com.zy.acs.manager.system.entity.User;
@@ -39,19 +40,11 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
        PageParam<User, BaseParam> page = userService.page(pageParam, pageParam.buildWrapper(true, wrapper -> wrapper.orderByAsc("create_time")));
        for (User record : page.getRecords()) {
        PageResult<User> pageResult = userService.pageRel(pageParam);
        for (User record : pageResult.getRecords()) {
            record.setRoles(userRoleService.listByUserId(record.getId()));
        }
        return R.ok().add(page);
    }

    @PreAuthorize("hasAuthority('system:user:list')")
    @PostMapping("/user/page1")
    public R page1(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
        return R.ok().add(userService.pageRel(pageParam));
        return R.ok().add(pageResult);
    }

    @PreAuthorize("hasAuthority('system:user:list')")