From 573d547728164c0de8b043eaa350f10697b32a0a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 25 九月 2023 22:11:53 +0800
Subject: [PATCH] 油烟

---
 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml |   18 ++++++++++++++----
 1 files changed, 14 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 664393c..366f0a5 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -162,16 +162,25 @@
             <if test="categories != null">
                 t1.category = #{categories}
             </if>
-            <if test="streetId != null">
-                and t1.community_id = #{streetId}
+            <if test="communityId != null">
+                and t1.community_id = #{communityId}
+            </if>
+            <if test=" streetId != null">
+                and t1.street_id = #{streetId}
             </if>
             <if test="code != null and code !=''">
                 and t1.code like concat('%',#{code},'%')
             </if>
-            <if test="site != null and site!=''">
+            <if test="code != null and code !=''">
+                and t1.code like concat('%',#{code},'%')
+            </if>
+            <if test="state != null and state!=''">
+                and t1.state =#{state}
+            </if>
+	     <if test="site != null and site!=''">
                 and t1.site like concat('%',#{site},'%')
             </if>
-            <if test="startTime !='' and endTime !='' and startTime!=null and endTime !=null">
+            <if test="startTime!=null and endTime !=null">
                 and t1.create_time between #{startTime} and #{endTime}
             </if>
         </where>
@@ -255,6 +264,7 @@
                 and t1.handling_opinion like concat('%',#{queryForViolationParam.handlingOpinion},'%')
             </if>
         </where>
+        order by t1.id desc
 
     </select>
 

--
Gitblit v1.8.0