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(); }