From 87a18903b0d098d3d5922a050ad788abecd3bfca Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Tue, 25 Feb 2025 20:49:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8F=90=E7=8E=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pay/service/impl/CashOutServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index f2292497..7f05933f 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -131,11 +131,15 @@ public class CashOutServiceImpl extends ServiceImpl impleme queryWrapper.eq(CashOut::getUserId, cashOut.getUserId()) .eq(CashOut::getUserType, 1); } else { - if (cashOut.getSysUserId() == null) { - return PageUtils.page(new PageInfo<>()); + if (cashOut.getUserId() != null) { + queryWrapper.eq(CashOut::getUserId, cashOut.getUserId()); } else { - queryWrapper.eq(CashOut::getUserId, cashOut.getSysUserId()) - .eq(CashOut::getUserType, 2); + if (cashOut.getSysUserId() == null) { + return PageUtils.page(new PageInfo<>()); + } else { + queryWrapper.eq(CashOut::getUserId, cashOut.getSysUserId()) + .eq(CashOut::getUserType, 2); + } } }