From 0d02ee0aeeaa7c4df579a57b6f75e59c69a1ed26 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:22:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index b3c8dd6..6928066 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -131,10 +131,10 @@
         left join ums_data_dictionary t2 on t1.category = t2.id
         left join ums_sccg_region t3 on t1.community_id=t3.id
         <where>
-            <if test="category != null">
+            <if test="categories != null">
                 category = #{categories}
-            </if>>
-            <if test="community_id != null">
+            </if>
+            <if test="communityId != null">
                 and community_id = #{communityId}
             </if>
             <if test="code != null and code !=''">
@@ -143,7 +143,7 @@
             <if test="site != null and site!=''">
                 and site like contact('%',#{site},'%')
             </if>
-            <if test="startTime !='' and endTime !=''">
+            <if test="startTime !='' and endTime !='' and startTime!=null and endTime !=null">
                 and create_time between #{startTime} and #{endTime}
             </if>
         </where>

--
Gitblit v1.8.0