From e8032ad89c1fc981b57bdc4995bb7db277b108a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Mon, 1 Jul 2024 17:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=97=B6=E9=97=B4=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/DcEventMapper.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
index 3582a36a..30e3a34e 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
@@ -343,18 +343,18 @@
             </if>
             <if test="direction != null  and direction != ''">and direction = #{direction}</if>
             <if test="userId != null ">and user_id = #{userId}</if>
-            <if test="eventState == 1 ">and start_time BETWEEN #{startTime} and #{endTime}</if>
+            <if test="eventState != null ">and event_state = #{eventState}</if>
+            <if test="eventState == 1 and startTime !=null and  endTime != null ">and start_time BETWEEN #{startTime} and #{endTime}</if>
 
-            <if test="eventState == 0  ">and occurrence_time BETWEEN #{startTime} and #{endTime}</if>
+            <if test="eventState == 0   and startTime !=null and  endTime != null ">and occurrence_time BETWEEN #{startTime} and #{endTime}</if>
 
-            <if test="eventState == 2 ">and end_time BETWEEN #{startTime} and #{endTime}</if>
+            <if test="eventState == 2  and startTime !=null and  endTime != null ">and end_time BETWEEN #{startTime} and #{endTime}</if>
             <if test="estimatedEndTime != null ">and estimated_end_time = #{estimatedEndTime}</if>
             <if test="eventLevel != null ">and event_level = #{eventLevel}</if>
             <if test="eventType != null ">and event_type = #{eventType}</if>
             <if test="eventSubclass != null  and eventSubclass != ''">and event_subclass = #{eventSubclass}</if>
             <if test="eventCause != null  and eventCause != ''">and event_cause = #{eventCause}</if>
             <if test="description != null  and description != ''">and description = #{description}</if>
-            <if test="eventState != null ">and event_state = #{eventState}</if>
             <if test="eventSource != null ">and event_source = #{eventSource}</if>
             <if test="eventNature != null ">and event_nature = #{eventNature}</if>
             <if test="eventSourceTips != null  and eventSourceTips != ''">and event_source_tips = #{eventSourceTips}