!1448 fix(user):修复用户角色过滤逻辑，确保当用户不包含当前选中角色时返回空结果而非全部用户

Merge pull request !1448 from Manumiter/master-jdk17

!1448 fix(user):修复用户角色过滤逻辑，确保当用户不包含当前选中角色时返回空结果而非全部用户
Merge pull request !1448 from Manumiter/master-jdk17
芋道源码 · Gitee
2 parents ec2bca73 31f6d03d
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 {
         // 如果有角色编号，查询角色对应的用户编号
         Set<Long> userIds = reqVO.getRoleId() != null ?
                 permissionService.getUserRoleIdListByRoleId(singleton(reqVO.getRoleId())) : null;
-
+        if (userIds != null && userIds.isEmpty()) {
+            return PageResult.empty();
+        }
         // 分页查询
         return userMapper.selectPage(reqVO, getDeptCondition(reqVO.getDeptId()), userIds);
     }