Commit 31f6d03d67fa901d9e8be2a2e43dd8bd0742ba06
1 parent
2c41d562
fix(user):修复用户角色过滤逻辑,确保当用户不包含当前选中角色时返回空结果而非全部用户
Showing
1 changed file
with
3 additions
and
1 deletions
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
| @@ -276,7 +276,9 @@ public class AdminUserServiceImpl implements AdminUserService { | @@ -276,7 +276,9 @@ public class AdminUserServiceImpl implements AdminUserService { | ||
| 276 | // 如果有角色编号,查询角色对应的用户编号 | 276 | // 如果有角色编号,查询角色对应的用户编号 |
| 277 | Set<Long> userIds = reqVO.getRoleId() != null ? | 277 | Set<Long> userIds = reqVO.getRoleId() != null ? |
| 278 | permissionService.getUserRoleIdListByRoleId(singleton(reqVO.getRoleId())) : null; | 278 | permissionService.getUserRoleIdListByRoleId(singleton(reqVO.getRoleId())) : null; |
| 279 | - | 279 | + if (userIds != null && userIds.isEmpty()) { |
| 280 | + return PageResult.empty(); | ||
| 281 | + } | ||
| 280 | // 分页查询 | 282 | // 分页查询 |
| 281 | return userMapper.selectPage(reqVO, getDeptCondition(reqVO.getDeptId()), userIds); | 283 | return userMapper.selectPage(reqVO, getDeptCondition(reqVO.getDeptId()), userIds); |
| 282 | } | 284 | } |