From 810a6c672e71df1062631c0c054fb10dc53443cc Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Wed, 4 Feb 2026 11:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=88=97=E8=A1=A8=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=88=86=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../other/app/command/dynamic/query/DynamicFollowQryExe.java | 2 +- .../rds/service/dynamic/impl/DynamicTimelineServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicFollowQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicFollowQryExe.java index 583a344d..58771f2a 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicFollowQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicFollowQryExe.java @@ -79,7 +79,7 @@ public class DynamicFollowQryExe { .filter(userId -> !blackUserSet.contains(userId)) .toList(); PageResult timelines = dynamicTimelineService - .pageByTimeDesc(list, userRegionGateway.getRegionId(cmd.getReqUserId()), + .pageByTimeDesc(list, null, cmd.getPageReq(), Boolean.TRUE); if (CollectionUtils.isEmpty(timelines.getRecords())) { diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicTimelineServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicTimelineServiceImpl.java index e9765e19..46ee6c0b 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicTimelineServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicTimelineServiceImpl.java @@ -81,7 +81,7 @@ public class DynamicTimelineServiceImpl extends return query() .in(DynamicTimeline::getCreateUser, ids) .eq(DynamicTimeline::getOwn, isOwn) - .in(DynamicTimeline::getRegion, region, "") + .in(region != null, DynamicTimeline::getRegion, region, "") .orderByDesc(DynamicTimeline::getCreateTime) .page(pageQuery); }