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