From 2b1a74f4faa5a00a294bdc6a6d956c2e009cf467 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 16 Apr 2024 15:32:09 +0800
Subject: [PATCH] 管理员过滤文章

---
 src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
index cc2791a..da5f846 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -159,7 +159,20 @@
         jg.sort
         FROM jczz_grid jg
         left join blade_region br on br.village_code = jg.community_code and br.region_level = 5
-        where jg.is_deleted = 0 and br.city_code = #{region.cityCode}
+        where jg.is_deleted = 0 and jg.community_code like concat(#{region.cityCode},'%')
+            <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 1=1
+                    </otherwise>
+                </choose>
+            </if>
         union all
         </if>
         SELECT
@@ -169,7 +182,7 @@
         sort
         FROM blade_region
         where 1=1
-        and district_code = '361102'
+        and district_code like concat(#{region.districtCode},'%')
         <if test="region.parentCode!=null and region.parentCode!=''">
             and parent_code = #{region.parentCode}
         </if>
@@ -244,7 +257,7 @@
         jg.sort
         FROM blade_region br
         right join jczz_grid jg on jg.community_code = br.village_code and jg.is_deleted = 0
-        where (br.ancestors like concat('%',#{regionCode},'%') or br.code = #{regionCode} or jg.grid_code = '36110200302701')
+        where (br.ancestors like concat('%',#{regionCode},'%') or br.code = #{regionCode} or jg.grid_code = #{regionCode})
         )
     </select>
 
@@ -289,4 +302,39 @@
         WHERE is_deleted = 0  AND pcs_code IS NOT NULL
     </select>
 
+    <!--查询当前文章范围对应的社区编号字符串集合-->
+    <select id="getAllCommunityNameListString" resultType="java.lang.String">
+        SELECT
+        code
+        FROM blade_region
+        where
+        <foreach collection="articleRange.split(',')" item="item" open="(" close=")" separator="OR">
+            ancestors like concat('%',#{item},'%')
+        </foreach>
+        and region_level = 5
+        union
+        (
+        SELECT
+        br.code
+        FROM jczz_district jd
+        left join blade_region br on jd.community_code = br.village_code
+        where br.region_level = 5
+        and jd.id in
+        <foreach collection="articleRange.split(',')" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        )
+        union
+        (
+        SELECT
+        jd.id
+        FROM jczz_district jd
+        where
+        jd.id in
+        <foreach collection="articleRange.split(',')" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        )
+    </select>
+
 </mapper>

--
Gitblit v1.9.3