diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java index fd980e3..8c8b16c 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java @@ -17,6 +17,8 @@ public class ListRoleDTO extends CommonParam { private String roleKey; private Integer status; private Params params; + private Integer page; // 当前页码 + private Integer limit; // 每页条数 @Data @EqualsAndHashCode diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java index c7c02c7..4c3beeb 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java @@ -38,14 +38,16 @@ public class RoleController { // return roleService.selectRoleList(listRole); // } - @RequiresPermissions("system:role:list") +// @RequiresPermissions("system:role:list") @GetMapping("/list") public AjaxResult list( @RequestParam(required = false) String roleName, @RequestParam(required = false) String roleKey, @RequestParam(required = false) Integer status, @RequestParam(required = false) String beginTime, - @RequestParam(required = false) String endTime + @RequestParam(required = false) String endTime, + @RequestParam(defaultValue = "1") Integer page, // 默认页码为1 + @RequestParam(defaultValue = "10") Integer limit // 默认每页条数为10 ) { ListRoleDTO.Params params = new ListRoleDTO.Params(); params.setBeginTime(beginTime); @@ -56,6 +58,8 @@ public class RoleController { listRole.setRoleKey(roleKey); listRole.setStatus(status); listRole.setParams(params); + listRole.setPage(page); + listRole.setLimit(limit); return roleService.selectRoleList(listRole); }