ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-31 22:57:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(system/user): 分页列表调整排除用户 ID 列表参数为 roleId，改为后端根据 roleId 查询

Browse Source
This commit is contained in:
Charles7c
2025-02-14 23:01:09 +08:00
parent 9eb0252d09
commit 144cfa27ce
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
continew-module-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java
View File

@@ -74,8 +74,9 @@ public class UserQuery implements Serializable {
private List<Long> userIds;
/**
* 不包含的用户 ID 列表
* 角色 ID
* <p>用于在角色授权用户时，过滤掉已经分配给该角色的用户</p>
*/
@Schema(description = "不包含的用户 ID 列表", example = "[1,2]")
private List<Long> excludeUserIds;
@Schema(description = "角色 ID", example = "1")
private Long roleId;
}

6
continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
View File

@@ -488,7 +488,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
List<Date> createTimeList = query.getCreateTime();
Long deptId = query.getDeptId();
List<Long> userIdList = query.getUserIds();
List<Long> excludeUserIdList = query.getExcludeUserIds();
// 获取排除用户 ID 列表
List<Long> excludeUserIdList = null;
if (null != query.getRoleId()) {
excludeUserIdList = userRoleService.listUserIdByRoleId(query.getRoleId());
}
return new QueryWrapper<UserDO>().and(StrUtil.isNotBlank(description), q -> q.like("t1.username", description)
.or()
.like("t1.nickname", description)