From 31c36c337300ffc56f1a3eebd2dd19340dbd3fd5 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 30 Jan 2026 09:02:24 +0800
Subject: [PATCH] 机构优化
---
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml | 15 ++++++++++++---
1 files changed, 12 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 38afb5a..81ffd85 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) < 12 limit 0,#{size}
</select>
+
<select id="selectRegionPage" resultType="org.sxkj.system.vo.RegionVO">
SELECT
id,
@@ -147,22 +148,30 @@
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'
+ and region_level > '2'
<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}),'%')
+ and 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}
--
Gitblit v1.9.3