From 68c0e1b6bbdb5dfe5cc391a014261d730bd8a807 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 19 Apr 2022 09:39:37 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B1=95=E7=A4=BA=E6=9C=AA=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E7=9A=84=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/meeting/service/impl/PayMeetingServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index 2e90a562..c751db48 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -775,7 +775,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         }
         //会议分类：1可报名/2已报名/3全部
         Integer meetingSignUpType = Integer.valueOf(request.getParameter("meetingSignUpType"));
-        //可报名或者报名状态选择可报名  1可报名/2已报名/3全部/4 app全部(可报名和进行中)
+        //可报名或者报名状态选择可报名  1可报名/2已报名/0全部/4 app全部(可报名和进行中)
         if (Objects.equals(meetingSignUpType, 1)||Objects.equals(signUpStatus,8)) {
             //queryWrapper.ne("pms.company_contact_id",contactId);
             queryWrapper.ge("register_deadline", now);
@@ -791,10 +791,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         } else if (Objects.equals(meetingSignUpType, 2 )) {
             queryWrapper.eq("pms.company_contact_id", contactId);
             return baseMapper.pageListContract2(page, queryWrapper, now);
-        } else if (Objects.equals(meetingSignUpType, 3)){
+        } else if (Objects.equals(meetingSignUpType, 0)){
             return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
         }else {
-            queryWrapper.lt("end_time", now);
+            queryWrapper.ge("end_time", now);
             return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
         }
     }