From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并，网格员区域树查询修改，解决不显示网格问题
---
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 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 1c437c4..7c32c71 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -232,7 +232,7 @@
SELECT
code,parent_code,name,ancestors,region_level,sort
FROM blade_region
- where ancestors like concat('%',#{regionCode},'%')
+ where (ancestors like concat('%',#{regionCode},'%') or code = #{regionCode})
union all
(
SELECT
@@ -244,8 +244,49 @@
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},'%')
+ 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>
+
+ <!--查询公安相关的区域数据-->
+ <select id="getPoliceList" resultType="org.springblade.modules.system.entity.Region">
+ SELECT id as code,parentId as parent_code,name,'' as ancestors,null as region_level,1 as sort FROM police_region
+ where 1=1
+ <if test="communityCode!=null and communityCode!=''">
+ and id like concat('%',#{communityCode},'%')
+ </if>
+ </select>
+
+
+ <!--查询公安对应的辖区树-->
+ <select id="getPoliceTreeList" resultType="org.springblade.common.node.TreeStringNode">
+ SELECT
+ CODE AS id,
+ parent_code AS parentId,
+ NAME
+ FROM jczz_police_station
+ WHERE is_deleted = 0
+ UNION ALL
+ SELECT
+ jw_grid_code AS id,
+ pcs_code AS parentId,
+ community_name AS NAME
+ FROM jczz_police_affairs_grid
+ WHERE is_deleted = 0 AND pcs_code IS NOT NULL
+ </select>
+
</mapper>
--
Gitblit v1.9.3