From c964ce0508893eaeaf430f801607a92ba81f11f2 Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Wed, 18 Jun 2025 16:06:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DSysRelationApiProvider=E6=A0=B9=E6=8D=AE=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=88=96=E7=BB=84=E4=B8=8B=E6=9F=A5=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E4=BA=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relation/provider/SysRelationApiProvider.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/relation/provider/SysRelationApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/relation/provider/SysRelationApiProvider.java index 9b904a7e..428d0a56 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/relation/provider/SysRelationApiProvider.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/relation/provider/SysRelationApiProvider.java @@ -25,6 +25,7 @@ import vip.xiaonuo.sys.modular.relation.entity.SysRelation; import vip.xiaonuo.sys.modular.relation.enums.SysRelationCategoryEnum; import vip.xiaonuo.sys.modular.relation.service.SysRelationService; import vip.xiaonuo.sys.modular.user.entity.SysUser; +import vip.xiaonuo.sys.modular.user.enums.SysUserStatusEnum; import vip.xiaonuo.sys.modular.user.service.SysUserService; import java.util.Collection; @@ -51,8 +52,10 @@ public class SysRelationApiProvider implements SysRelationApi { public List getUserIdListByRoleIdList(List roleIdList) { List userIdList = sysRelationService.getRelationObjectIdListByTargetIdListAndCategory(roleIdList, SysRelationCategoryEnum.SYS_USER_HAS_ROLE.getValue()); - if(ObjectUtil.isEmpty(userIdList)){ - return sysUserService.listByIds(userIdList).stream().map(SysUser::getId).collect(Collectors.toList()); + if(ObjectUtil.isNotEmpty(userIdList)){ + return sysUserService.list(new LambdaQueryWrapper().in(SysUser::getId, userIdList) + .eq(SysUser::getUserStatus, SysUserStatusEnum.ENABLE.getValue())) + .stream().map(SysUser::getId).collect(Collectors.toList()); } else { return CollectionUtil.newArrayList(); } @@ -62,8 +65,10 @@ public class SysRelationApiProvider implements SysRelationApi { public List getUserIdListByGroupIdList(List groupIdList) { List userIdList = sysRelationService.getRelationObjectIdListByTargetIdListAndCategory(groupIdList, SysRelationCategoryEnum.SYS_USER_HAS_GROUP.getValue()); - if(ObjectUtil.isEmpty(userIdList)){ - return sysUserService.listByIds(userIdList).stream().map(SysUser::getId).collect(Collectors.toList()); + if(ObjectUtil.isNotEmpty(userIdList)){ + return sysUserService.list(new LambdaQueryWrapper().in(SysUser::getId, userIdList) + .eq(SysUser::getUserStatus, SysUserStatusEnum.ENABLE.getValue())) + .stream().map(SysUser::getId).collect(Collectors.toList()); } else { return CollectionUtil.newArrayList(); }