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()),