chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.chually.cn/chujinwang/chushangcloud

This commit is contained in:
mashuanghui 2024-08-19 13:52:44 +08:00
parent b51d13397b d4cfa0ff25
commit 052d11f60e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java
View File

@ -17,6 +17,8 @@ public class ListRoleDTO extends CommonParam {
private String roleKey; private String roleKey;
private Integer status; private Integer status;
private Params params; private Params params;
private Integer page; // 当前页码
private Integer limit; // 每页条数
@Data @Data
@EqualsAndHashCode @EqualsAndHashCode

8
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java
View File

@ -38,14 +38,16 @@ public class RoleController {
// return roleService.selectRoleList(listRole); // return roleService.selectRoleList(listRole);
// } // }
@RequiresPermissions("system:role:list") // @RequiresPermissions("system:role:list")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list( public AjaxResult list(
@RequestParam(required = false) String roleName, @RequestParam(required = false) String roleName,
@RequestParam(required = false) String roleKey, @RequestParam(required = false) String roleKey,
@RequestParam(required = false) Integer status, @RequestParam(required = false) Integer status,
@RequestParam(required = false) String beginTime, @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(); ListRoleDTO.Params params = new ListRoleDTO.Params();
params.setBeginTime(beginTime); params.setBeginTime(beginTime);
@ -56,6 +58,8 @@ public class RoleController {
listRole.setRoleKey(roleKey); listRole.setRoleKey(roleKey);
listRole.setStatus(status); listRole.setStatus(status);
listRole.setParams(params); listRole.setParams(params);
listRole.setPage(page);
listRole.setLimit(limit);
return roleService.selectRoleList(listRole); return roleService.selectRoleList(listRole);
} }