From a5fac95408a43ad43de9d88c30d06c0918c7bc8f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 29 May 2024 11:14:44 +0800
Subject: [PATCH] 配置调整
---
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 68 ++++++++++++++++++++++++++++++++-
1 files changed, 65 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 8ba72b5..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,8 +257,22 @@
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})
+ where (br.ancestors like concat('%',#{regionCode},'%') or br.code = #{regionCode} or jg.grid_code = #{regionCode})
)
+ </select>
+
+ <!--查询网格员对应的网格区域-->
+ <select id="getGridRegionChildList" resultType="org.springblade.modules.system.entity.Region">
+ SELECT
+ jg.grid_code as code,
+ jg.community_code as parent_code,
+ jg.grid_name as name,
+ '' as ancestors,
+ 6 as region_level,
+ jg.sort
+ FROM blade_region br
+ right join jczz_grid jg on jg.community_code = br.village_code and jg.is_deleted = 0
+ where jg.grid_code = #{regionCode}
</select>
<!--查询公安相关的区域数据-->
@@ -275,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