From 50259f514fbd397f594c24d7c2c40b829894a110 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Thu, 4 Dec 2025 15:07:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E9=83=A8=E9=97=A8=E4=B8=8E?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E5=85=A8=E9=87=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/admin/dept/DeptController.java | 4 +++- .../controller/admin/dept/vo/dept/DeptListReqVO.java | 3 +++ .../system/controller/admin/user/UserController.java | 3 ++- .../zt/plat/module/system/dal/mysql/dept/DeptMapper.java | 5 +++++ .../module/system/dal/mysql/user/AdminUserMapper.java | 9 +++++++-- .../module/system/service/user/AdminUserService.java | 6 +++++- .../module/system/service/user/AdminUserServiceImpl.java | 4 ++-- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/dept/DeptController.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/dept/DeptController.java index 50371ce2..93876898 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/dept/DeptController.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/dept/DeptController.java @@ -37,6 +37,7 @@ public class DeptController { @Resource private DeptService deptService; + private static final int SIMPLE_LIST_LIMIT = 100; @PostMapping("create") @Operation(summary = "创建部门") @@ -85,7 +86,8 @@ public class DeptController { @Operation(summary = "获取部门精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项") public CommonResult> getSimpleDeptList() { List list = deptService.getDeptList( - new DeptListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus())); + new DeptListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()) + .setLimit(SIMPLE_LIST_LIMIT)); return success(BeanUtils.toBean(list, DeptSimpleRespVO.class)); } diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java index 923b01b0..e4186555 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java @@ -26,4 +26,7 @@ public class DeptListReqVO { @Schema(description = "部门编号集合，支持多部门查询", example = "[\"1001\", \"1002\"]") private List ids; + + @Schema(description = "最大返回数量限制", example = "100") + private Integer limit; } diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/UserController.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/UserController.java index c6c17cbd..4ca16850 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/UserController.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/UserController.java @@ -37,6 +37,7 @@ public class UserController { @Resource private AdminUserService userService; + private static final int SIMPLE_LIST_LIMIT = 100; @PostMapping("/create") @Operation(summary = "新增用户") @@ -94,7 +95,7 @@ public class UserController { @GetMapping({"/list-all-simple", "/simple-list"}) @Operation(summary = "获取用户精简信息列表", description = "只包含被开启的用户，主要用于前端的下拉选项") public CommonResult> getSimpleUserList() { - List list = userService.getUserListByStatus(CommonStatusEnum.ENABLE.getStatus()); + List list = userService.getUserListByStatus(CommonStatusEnum.ENABLE.getStatus(), SIMPLE_LIST_LIMIT); return success(UserConvert.INSTANCE.convertSimpleList(list)); } diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/dal/mysql/dept/DeptMapper.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/dal/mysql/dept/DeptMapper.java index afe90bc9..fbd7c2c0 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/dal/mysql/dept/DeptMapper.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/dal/mysql/dept/DeptMapper.java @@ -36,6 +36,11 @@ public interface DeptMapper extends BaseMapperX { .collect(Collectors.toList()); query.inIfPresent(DeptDO::getId, ids); } + query.orderByAsc(DeptDO::getSort); + Integer limit = reqVO.getLimit(); + if (limit != null && limit > 0) { + query.last("LIMIT " + limit); + } return selectList(query); } diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/dal/mysql/user/AdminUserMapper.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/dal/mysql/user/AdminUserMapper.java index 270a3534..17fbcd76 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/dal/mysql/user/AdminUserMapper.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/dal/mysql/user/AdminUserMapper.java @@ -60,8 +60,13 @@ public interface AdminUserMapper extends BaseMapperX { return selectList(new LambdaQueryWrapperX().like(AdminUserDO::getNickname, nickname)); } - default List selectListByStatus(Integer status) { - return selectList(AdminUserDO::getStatus, status); + default List selectListByStatus(Integer status, Integer limit) { + LambdaQueryWrapperX query = new LambdaQueryWrapperX() + .eq(AdminUserDO::getStatus, status); + if (limit != null && limit > 0) { + query.last("LIMIT " + limit); + } + return selectList(query); } /** diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserService.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserService.java index 63f54ef3..967f3161 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserService.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserService.java @@ -193,7 +193,11 @@ public interface AdminUserService { * @param status 状态 * @return 用户们 */ - List getUserListByStatus(Integer status); + List getUserListByStatus(Integer status, Integer limit); + + default List getUserListByStatus(Integer status) { + return getUserListByStatus(status, null); + } /** * 判断密码是否匹配 diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java index d1b00ab7..db5a2176 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java @@ -651,8 +651,8 @@ public class AdminUserServiceImpl implements AdminUserService { } @Override - public List getUserListByStatus(Integer status) { - List users = userMapper.selectListByStatus(status); + public List getUserListByStatus(Integer status, Integer limit) { + List users = userMapper.selectListByStatus(status, limit); fillUserDeptInfo(users); return users; }