From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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..ffbffac 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -248,4 +248,27 @@
         )
     </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
+    </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