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

---
 src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 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 0b885da..852a534 100644
--- a/src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml
+++ b/src/main/java/org/springblade/modules/community/mapper/CommunityMapper.xml
@@ -23,16 +23,36 @@
 
     <!--自定义分页列表查询-->
     <select id="selectCommunityPage" resultType="org.springblade.modules.community.vo.CommunityVO">
-        select * from jczz_community
-        where is_deleted = 0
+        select
+        jc.*,
+        br.town_name townName
+        from jczz_community jc
+        left join blade_region br on br.code = jc.code
+        where jc.is_deleted = 0
         <if test="community.name !=null and community.name!=''">
-            and name like concat('%',#{community.name},'%')
+            and jc.name like concat('%',#{community.name},'%')
         </if>
         <if test="community.code !=null and community.code!=''">
-            and code like concat('%',#{community.code},'%')
+            and jc.code like concat('%',#{community.code},'%')
         </if>
         <if test="community.streetCode !=null and community.streetCode!=''">
-            and street_code like concat('%',#{community.streetCode},'%')
+            and jc.street_code like concat('%',#{community.streetCode},'%')
+        </if>
+        <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