From 77fea47f1fa683f9a0356df3d2328e2bb68b28cf Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 18 Jan 2024 17:56:22 +0800
Subject: [PATCH] 数据过滤调整

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index f3a918f..3d91c55 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -211,8 +211,18 @@
             <if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
                 AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
             </if>
-            <if test="household.regionCode!=null and household.regionCode!=''">
-                and jg.community_code like concat(#{household.regionCode},'%')
+            <if test="isAdministrator==2">
+                <choose>
+                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+                        and jg.community_code in
+                        <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+                            #{code}
+                        </foreach>
+                    </when>
+                    <otherwise>
+                        and jg.community_code in ('')
+                    </otherwise>
+                </choose>
             </if>
             <if test="household.building!=null and household.building!=''">
                 and jhs.building like concat(#{household.building},'%')

--
Gitblit v1.9.3