From be9895246347d9d2f6e4cc2107f24ceb04e35c40 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Mon, 10 Nov 2025 18:17:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=B8=81=E6=B5=81=E6=B0=B4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FreightBalanceRunningWaterServiceImpl.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/freight/impl/FreightBalanceRunningWaterServiceImpl.java b/rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/freight/impl/FreightBalanceRunningWaterServiceImpl.java
index 0b47350e..a38595d0 100644
--- a/rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/freight/impl/FreightBalanceRunningWaterServiceImpl.java
+++ b/rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/freight/impl/FreightBalanceRunningWaterServiceImpl.java
@@ -91,8 +91,11 @@ public class FreightBalanceRunningWaterServiceImpl extends
     return query()
         .eq(StringUtils.isNotBlank(query.getSysOrigin()),
             FreightBalanceRunningWater::getSysOrigin, query.getSysOrigin())
-        .eq(Objects.nonNull(query.getUserId()),
-            FreightBalanceRunningWater::getUserId, query.getUserId())
+        .and(Objects.nonNull(query.getUserId()),e -> {
+          e.eq(FreightBalanceRunningWater::getUserId, query.getUserId())
+              .or()
+              .eq(FreightBalanceRunningWater::getAcceptUserId, query.getUserId());
+        })
         .eq(Objects.nonNull(query.getAcceptUserId()),
             FreightBalanceRunningWater::getAcceptUserId, query.getAcceptUserId())
         .eq(StringUtils.isNotBlank(query.getOrigin()),