From c82e4c91f7a55758d2f67a43734faed1aa507fb3 Mon Sep 17 00:00:00 2001 From: hy001 Date: Sat, 9 May 2026 11:19:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=B8=81=E6=94=B6=E6=94=AF=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/app/user/UserWalletServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserWalletServiceImpl.java b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserWalletServiceImpl.java index b3e90a39..47fcad50 100644 --- a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserWalletServiceImpl.java +++ b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserWalletServiceImpl.java @@ -180,19 +180,23 @@ public class UserWalletServiceImpl implements UserWalletService { private UserGoldRunningWaterClsTmpCO getGoldRunningWaterDbFallback( UserGoldRunningWaterBackQryCmd query) { - if (StringUtils.isNotBlank(query.getContext())) { + if (StringUtils.isNotBlank(query.getContext()) && Objects.isNull(query.getLastId())) { return new UserGoldRunningWaterClsTmpCO() .setListOver(true) .setWaters(Lists.newArrayList()); } List waters = listGoldRunningWater(query); + int limit = Optional.ofNullable(query.getLimit()).filter(value -> value > 0) + .orElse(PageConstant.DEFAULT_LIMIT_SIZE); if (CollectionUtils.isEmpty(waters)) { - return null; + return new UserGoldRunningWaterClsTmpCO() + .setListOver(true) + .setWaters(Lists.newArrayList()); } return new UserGoldRunningWaterClsTmpCO() - .setListOver(true) + .setListOver(waters.size() < limit) .setWaters(waters); }