From 1012aec3d37aa19e56f622ecd39b59f36e7fb609 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 6 Jan 2022 17:37:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81--=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/Impl/SarPublicIdeaServiceImpl.java     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
index b9d28a81..319c4ef4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
@@ -53,11 +53,21 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
                         .ge(start != null, "start_time", start)
                         .le(end != null, "end_time", end)
                         .orderByDesc("start_time");
+            }else if (start!=null){
+                list.like(StringUtils.isNotEmpty(category), "category", category)
+                        .like(StringUtils.isNotEmpty(cname), "cid", cname)
+                        .le(start != null, "start_time", start)
+                        .ge(start != null, "end_time", start)
+                        .orderByDesc("start_time");
+            }else if (end!=null){
+                list.like(StringUtils.isNotEmpty(category), "category", category)
+                        .like(StringUtils.isNotEmpty(cname), "cid", cname)
+                        .le(end != null, "start_time", end)
+                        .ge(end != null, "end_time", end)
+                        .orderByDesc("start_time");
             }else {
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)
-                        .ge(start != null, "start_time", start)
-                        .le(end != null, "end_time", end)
                         .orderByDesc("start_time");
             }
         } else {