diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicLatestQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicLatestQryExe.java index dfd394ce..3742228c 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicLatestQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicLatestQryExe.java @@ -57,8 +57,7 @@ public class DynamicLatestQryExe { public PageResult execute(DynamicLimitCmd cmd) { PageResult dynamics = dynamicContentService - .pageByTimeDesc(cmd.getPageReq(), userRegionGateway.getRegionId(cmd.getReqUserId()), - cmd.requireReqSysOrigin()); + .pageByTimeDesc(cmd.getPageReq(), null, cmd.requireReqSysOrigin()); if (CollectionUtils.isEmpty(dynamics.getRecords())) { return PageResult.newPageResult(0); diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicContentServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicContentServiceImpl.java index 2496fa5b..ba4865b1 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicContentServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicContentServiceImpl.java @@ -62,7 +62,7 @@ public class DynamicContentServiceImpl extends return query() .eq(DynamicContent::getDel, Boolean.FALSE) .eq(DynamicContent::getSysOrigin, sysOrigin) - .eq(DynamicContent::getRegion, region) + .eq(region != null, DynamicContent::getRegion, region) .orderByDesc(DynamicContent::getCreateTime) .page(pageQuery); }