From d46ca134f82fd106bfbbbd71aef7184805e6d7e7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 09:17:54 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml b/src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml
index 614785d..852a534 100644
--- a/src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml
+++ b/src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml
@@ -24,7 +24,8 @@
     <!--自定义分页列表查询-->
     <select id="selectCommunityPage" resultType="org.springblade.modules.community.vo.CommunityVO">
         select
-        jc.*
+        jc.*,
+        br.town_name townName
         from jczz_community jc
         left join blade_region br on br.code = jc.code
         where jc.is_deleted = 0
@@ -37,8 +38,21 @@
         <if test="community.streetCode !=null and community.streetCode!=''">
             and jc.street_code like concat('%',#{community.streetCode},'%')
         </if>
-        <if test="community.regionCode !=null and community.regionCode !=''">
-            and jc.code like concat('%',#{community.regionCode},'%')
+        <if test="community.townName !=null and community.townName !=''">
+            and br.town_name like concat('%',#{community.townName},'%')
+        </if>
+        <if test="isAdministrator==2">
+            <choose>
+                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+                    and jc.code in
+                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+                        #{code}
+                    </foreach>
+                </when>
+                <otherwise>
+                    and jc.code in ('')
+                </otherwise>
+            </choose>
         </if>
     </select>
 

--
Gitblit v1.9.3