关注列表去除分区
This commit is contained in:
parent
2281949767
commit
810a6c672e
@ -79,7 +79,7 @@ public class DynamicFollowQryExe {
|
|||||||
.filter(userId -> !blackUserSet.contains(userId))
|
.filter(userId -> !blackUserSet.contains(userId))
|
||||||
.toList();
|
.toList();
|
||||||
PageResult<DynamicTimeline> timelines = dynamicTimelineService
|
PageResult<DynamicTimeline> timelines = dynamicTimelineService
|
||||||
.pageByTimeDesc(list, userRegionGateway.getRegionId(cmd.getReqUserId()),
|
.pageByTimeDesc(list, null,
|
||||||
cmd.getPageReq(), Boolean.TRUE);
|
cmd.getPageReq(), Boolean.TRUE);
|
||||||
|
|
||||||
if (CollectionUtils.isEmpty(timelines.getRecords())) {
|
if (CollectionUtils.isEmpty(timelines.getRecords())) {
|
||||||
|
|||||||
@ -81,7 +81,7 @@ public class DynamicTimelineServiceImpl extends
|
|||||||
return query()
|
return query()
|
||||||
.in(DynamicTimeline::getCreateUser, ids)
|
.in(DynamicTimeline::getCreateUser, ids)
|
||||||
.eq(DynamicTimeline::getOwn, isOwn)
|
.eq(DynamicTimeline::getOwn, isOwn)
|
||||||
.in(DynamicTimeline::getRegion, region, "")
|
.in(region != null, DynamicTimeline::getRegion, region, "")
|
||||||
.orderByDesc(DynamicTimeline::getCreateTime)
|
.orderByDesc(DynamicTimeline::getCreateTime)
|
||||||
.page(pageQuery);
|
.page(pageQuery);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user