From 521714609291b201cd2e259dd2968243b644b272 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 16 二月 2023 14:10:38 +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 |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 70b64c2..a82df1a 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -63,8 +63,11 @@
         LEFT JOIN ums_data_dictionary AS t4 ON uv.type_id = t4.id
         LEFT JOIN ums_sccg_region t5 ON ubc.street_id = t5.id
         <where>
-            <if test="state!=null">
+            <if test="state!=null and state!=6">
                 ubc.state=#{state}
+            </if>
+            <if test="state!=null and state==6">
+                ubc.state &gt;=#{state}
             </if>
             <if test="resource!=null">
                 and ubc.event_source=#{resource}
@@ -95,9 +98,12 @@
         left JOIN ums_data_dictionary AS t1 ON uib.category_id = t1.id
         left JOIN ums_sccg_region t2 ON ubc.community_id = t2.id
         <where>
-            <if test="state!=null">
+            <if test="state!=null and state!=6">
                 ubc.state=#{state}
             </if>
+            <if test="state!=null and state==6">
+                ubc.state &gt;=#{state}
+            </if>
             <if test="resource!=null">
                 and ubc.event_source=#{resource}
             </if>

--
Gitblit v1.8.0