gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【更新】修复SysRelationApiProvider根据角色或组下查找不到人的bug

pull/266/MERGE
xuyuxiang 2025-06-18 16:06:05 +08:00
parent c844d8635f
commit c964ce0508
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/relation/provider/SysRelationApiProvider.java
View File

@ -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<String> getUserIdListByRoleIdList(List<String> roleIdList) {
List<String> 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<SysUser>().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<String> getUserIdListByGroupIdList(List<String> groupIdList) {
List<String> 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<SysUser>().in(SysUser::getId, userIdList)
.eq(SysUser::getUserStatus, SysUserStatusEnum.ENABLE.getValue()))
.stream().map(SysUser::getId).collect(Collectors.toList());
} else {
return CollectionUtil.newArrayList();
}