From 6d22c8c3a119a07363e3fc454b3053369a4a795c Mon Sep 17 00:00:00 2001 From: easonzhu Date: Tue, 4 Mar 2025 13:51:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8E=A5=E5=8F=A3=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=81=97=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/service/admin/AdminGroupCollectService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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);