diff --git a/src/main/java/com/syzb/group/service/admin/AdminGroupCollectService.java b/src/main/java/com/syzb/group/service/admin/AdminGroupCollectService.java index 6ec4dc7..2d45cb3 100644 --- a/src/main/java/com/syzb/group/service/admin/AdminGroupCollectService.java +++ b/src/main/java/com/syzb/group/service/admin/AdminGroupCollectService.java @@ -226,7 +226,7 @@ public class AdminGroupCollectService { String nickName = query.getNickName(); Integer isOnline = query.getIsOnline(); Integer customerStatus = query.getCustomerStatus(); - Integer commentBlackStatus = query.getIsForbidden(); + Integer isForbidden = query.getIsForbidden(); Set moduleIdSet = groupCommonService.getModuleIds(groupId); if (CollUtil.isEmpty(moduleIdSet)) { return Pager.emptyPager(); @@ -264,7 +264,7 @@ public class AdminGroupCollectService { return vo; }).collect(Collectors.toList()); Stream voStream = list.stream(); - if (nickName != null) { + if (StrUtil.isNotEmpty(nickName)) { voStream = voStream.filter(vo -> nickName.equals(vo.getNickName())); } if (isOnline != null) { @@ -273,8 +273,8 @@ public class AdminGroupCollectService { if (customerStatus != null) { voStream = voStream.filter(vo -> customerStatus.equals(vo.getCustomerStatus())); } - if (commentBlackStatus != null) { - voStream = voStream.filter(vo -> commentBlackStatus.equals(vo.getIsForbidden())); + if (isForbidden != null) { + voStream = voStream.filter(vo -> isForbidden.equals(vo.getIsForbidden())); } List voList = voStream.collect(Collectors.toList()); List pageList = CollUtil.page(query.getCurrent() - 1, query.getSize(), voList);