修正接口字段遗漏
This commit is contained in:
parent
d3fadf8bbe
commit
6d22c8c3a1
@ -226,7 +226,7 @@ public class AdminGroupCollectService {
|
|||||||
String nickName = query.getNickName();
|
String nickName = query.getNickName();
|
||||||
Integer isOnline = query.getIsOnline();
|
Integer isOnline = query.getIsOnline();
|
||||||
Integer customerStatus = query.getCustomerStatus();
|
Integer customerStatus = query.getCustomerStatus();
|
||||||
Integer commentBlackStatus = query.getIsForbidden();
|
Integer isForbidden = query.getIsForbidden();
|
||||||
Set<Integer> moduleIdSet = groupCommonService.getModuleIds(groupId);
|
Set<Integer> moduleIdSet = groupCommonService.getModuleIds(groupId);
|
||||||
if (CollUtil.isEmpty(moduleIdSet)) {
|
if (CollUtil.isEmpty(moduleIdSet)) {
|
||||||
return Pager.emptyPager();
|
return Pager.emptyPager();
|
||||||
@ -264,7 +264,7 @@ public class AdminGroupCollectService {
|
|||||||
return vo;
|
return vo;
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
Stream<GroupCustomerVO> voStream = list.stream();
|
Stream<GroupCustomerVO> voStream = list.stream();
|
||||||
if (nickName != null) {
|
if (StrUtil.isNotEmpty(nickName)) {
|
||||||
voStream = voStream.filter(vo -> nickName.equals(vo.getNickName()));
|
voStream = voStream.filter(vo -> nickName.equals(vo.getNickName()));
|
||||||
}
|
}
|
||||||
if (isOnline != null) {
|
if (isOnline != null) {
|
||||||
@ -273,8 +273,8 @@ public class AdminGroupCollectService {
|
|||||||
if (customerStatus != null) {
|
if (customerStatus != null) {
|
||||||
voStream = voStream.filter(vo -> customerStatus.equals(vo.getCustomerStatus()));
|
voStream = voStream.filter(vo -> customerStatus.equals(vo.getCustomerStatus()));
|
||||||
}
|
}
|
||||||
if (commentBlackStatus != null) {
|
if (isForbidden != null) {
|
||||||
voStream = voStream.filter(vo -> commentBlackStatus.equals(vo.getIsForbidden()));
|
voStream = voStream.filter(vo -> isForbidden.equals(vo.getIsForbidden()));
|
||||||
}
|
}
|
||||||
List<GroupCustomerVO> voList = voStream.collect(Collectors.toList());
|
List<GroupCustomerVO> voList = voStream.collect(Collectors.toList());
|
||||||
List<GroupCustomerVO> pageList = CollUtil.page(query.getCurrent() - 1, query.getSize(), voList);
|
List<GroupCustomerVO> pageList = CollUtil.page(query.getCurrent() - 1, query.getSize(), voList);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user