From f75a068b1455902ba5514100b815f0f463da2533 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 28 Jan 2026 13:42:54 +0800
Subject: [PATCH] 机构区划

---
 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml
index f720da2..c1f6609 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml
@@ -118,6 +118,7 @@
         FROM blade_region
         where length(parent_code) &lt; 12 limit 0,#{size}
     </select>
+
     <select id="selectRegionPage" resultType="org.sxkj.system.vo.RegionVO">
         SELECT
             id,
@@ -147,27 +148,34 @@
                 region_level = '4' THEN district_name
             WHEN
                 region_level = '3' THEN city_name
+            WHEN
+                region_level = '2' THEN province_name
             ELSE NULL
             END AS parent_name
         FROM
             blade_region
         <where>
+            city_code = '360800000000'
             <if test="param2.status!=null">
                 and status = #{param1.status}
             </if>
             <if test="param2.cityCode!=null and param2.cityCode!='' ">
-                and city_code like concat(concat('%', #{param2.cityCode}),'%')
+                and code like concat(concat('%', #{param2.cityCode}),'%')
             </if>
             <if test="param2.districtName!=null and param2.districtName!=''">
                 and district_name like concat(concat('%', #{param2.districtName}),'%')
             </if>
             <if test="param2.parentName!=null and param2.parentName!=''">
-                and parent_name like concat(concat('%', #{param2.parentName}),'%')
+                and (
+                (region_level = '5' AND town_name LIKE CONCAT(CONCAT('%', #{param2.parentName}), '%'))
+                OR (region_level = '4' AND district_name LIKE CONCAT(CONCAT('%', #{param2.parentName}), '%'))
+                OR (region_level = '3' AND city_name LIKE CONCAT(CONCAT('%', #{param2.parentName}), '%'))
+                )
             </if>
             <if test="param2.regionLevel!=null">
                 and region_level = #{param2.regionLevel}
             </if>
-                ORDER BY create_time DESC
         </where>
+                ORDER BY create_time DESC
     </select>
 </mapper>

--
Gitblit v1.9.3