From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 81ffd85..69ecded 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
@@ -101,8 +101,18 @@
</select>
<select id="exportRegion" resultType="org.sxkj.system.excel.RegionExcel">
- SELECT *
- FROM blade_region ${ew.customSqlSegment}
+ SELECT
+ *
+ FROM
+ blade_region
+ <where>
+ <if test="regionIds!=null and regionIds.size()>0">
+ and id in
+ <foreach item="item" index="index" collection="regionIds" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ </where>
</select>
<!--查询parentCode 长度少于12 的-->
@@ -125,7 +135,7 @@
code,
parent_code,
ancestors,
- `name`,
+ "name",
province_code,
province_name,
city_code,
@@ -140,7 +150,7 @@
type,
sort,
remark,
- `status`,
+ "status",
CASE
WHEN
region_level = '5' THEN town_name
--
Gitblit v1.9.3