From fba3b84ee4e8b60f1536c50d032e4f199ec172a2 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 06 三月 2024 17:03:34 +0800 Subject: [PATCH] 合并代码 --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java index 3fb28d0..d27b96b 100644 --- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java +++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java @@ -262,7 +262,9 @@ Integer limit = registeredPersonnel.getLimit(); QueryWrapper<WorldCupPayment> queryWrapper = new QueryWrapper<WorldCupPayment>() .eq("worldCupId", id).eq("state", 1); - if(status == 1){ + if(null == status){ + queryWrapper.in("payStatus", Arrays.asList(2, 3)); + }else if(status == 1){ queryWrapper.eq("payStatus", 2); }else{ queryWrapper.eq("payStatus", 3); -- Gitblit v1.7.1