From df9a47128a707b37483f282083e317d1d0119156 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 16 四月 2026 17:31:28 +0800
Subject: [PATCH] 捐献确认基本信息集合新增排序

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java
index 66e4783..8d33768 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java
@@ -48,12 +48,10 @@
         if (serviceMeeting.getOrganizerId() != null){
             wrappers.eq(ServiceMeeting::getOrganizerId ,serviceMeeting.getOrganizerId());
         }
-        if (serviceMeeting.getStartTime() != null){
-            wrappers.eq(ServiceMeeting::getStartTime ,serviceMeeting.getStartTime());
+        if (serviceMeeting.getStartTime() != null&&serviceMeeting.getEndTime() != null){
+            wrappers.between(ServiceMeeting::getStartTime ,serviceMeeting.getStartTime(),serviceMeeting.getEndTime() );
         }
-        if (serviceMeeting.getEndTime() != null){
-            wrappers.eq(ServiceMeeting::getEndTime ,serviceMeeting.getEndTime());
-        }
+
         if (StringUtils.isNotBlank(serviceMeeting.getSummary())){
             wrappers.eq(ServiceMeeting::getSummary ,serviceMeeting.getSummary());
         }

--
Gitblit v1.9.3