From 0b64c4ff97161f3ad4cf0f17fafc6b42501a4a3b Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Tue, 23 Dec 2025 17:17:14 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E9=87=91=E5=B8=81=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=84=E7=90=86"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit be9895246347d9d2f6e4cc2107f24ceb04e35c40. --- .../impl/FreightBalanceRunningWaterServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 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 7c7f43fe..f2177301 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 @@ -102,11 +102,8 @@ public class FreightBalanceRunningWaterServiceImpl extends return query() .eq(StringUtils.isNotBlank(query.getSysOrigin()), FreightBalanceRunningWater::getSysOrigin, query.getSysOrigin()) - .and(Objects.nonNull(query.getUserId()),e -> { - e.eq(FreightBalanceRunningWater::getUserId, query.getUserId()) - .or() - .eq(FreightBalanceRunningWater::getAcceptUserId, query.getUserId()); - }) + .eq(Objects.nonNull(query.getUserId()), + FreightBalanceRunningWater::getUserId, query.getUserId()) .eq(Objects.nonNull(query.getAcceptUserId()), FreightBalanceRunningWater::getAcceptUserId, query.getAcceptUserId()) .eq(StringUtils.isNotBlank(query.getOrigin()),