From c440af9bed2f4414134168c95d5305174f91bd0d Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Wed, 18 Mar 2026 14:14:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E7=A9=BA=E5=9F=9F?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=85=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/airline/AirlineAreaMapper.xml    |  9 ++++++---
 .../resources/mapper/airline/AirlineMarkerMapper.xml  | 11 +++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/airline/AirlineAreaMapper.xml b/src/main/resources/mapper/airline/AirlineAreaMapper.xml
index a663473..1500d0c 100644
--- a/src/main/resources/mapper/airline/AirlineAreaMapper.xml
+++ b/src/main/resources/mapper/airline/AirlineAreaMapper.xml
@@ -83,12 +83,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 根据ID列表查询空域 -->
     <select id="selectAreaListByIds" parameterType="java.util.List" resultMap="AirlineAreaResult">
-        select id, name, area_type, status, points, shape, area_area, area_perimeter, radius, min_height, max_height, create_by, create_time, update_by, update_time, remark
-        from airline_area
-        where id in
+        select distinct aa.id, aa.name, aa.area_type, aa.status, aa.points, aa.shape, aa.area_area, aa.area_perimeter, aa.radius, aa.min_height, aa.max_height, aa.create_by, aa.create_time, aa.update_by, aa.update_time, aa.remark
+        from airline_area aa
+        inner join airline_area_group_info aagi on aa.id = aagi.area_id
+        where aagi.del_flag = 0
+        and aa.id in
         <foreach item="id" collection="list" open="(" separator="," close=")">
             #{id}
         </foreach>
+        order by aa.update_time desc
     </select>
 
     <!-- 根据用户ID查询空域列表 -->
diff --git a/src/main/resources/mapper/airline/AirlineMarkerMapper.xml b/src/main/resources/mapper/airline/AirlineMarkerMapper.xml
index 28d266f..2a925a5 100644
--- a/src/main/resources/mapper/airline/AirlineMarkerMapper.xml
+++ b/src/main/resources/mapper/airline/AirlineMarkerMapper.xml
@@ -106,13 +106,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 根据ID列表查询标注 -->
     <select id="selectMarkerListByIds" parameterType="java.util.List" resultMap="AirlineMarkerResult">
-        select id, marker_name, marker_type, status, color, icon, font_size, coordinates, description, create_by, create_time, update_by, update_time, remark
-        from airline_marker
-        where id in
+        select distinct am.id, am.marker_name, am.marker_type, am.status, am.color, am.icon, am.font_size, am.coordinates, am.description, am.create_by, am.create_time, am.update_by, am.update_time, am.remark
+        from airline_marker am
+        inner join airline_marker_group_info amgi on am.id = amgi.marker_id
+        where amgi.del_flag = 0
+        and am.id in
         <foreach item="id" collection="list" open="(" separator="," close=")">
             #{id}
         </foreach>
-        and status = 1
+        and am.status = 1
+        order by am.update_time desc
     </select>
 
     <!-- 根据用户ID查询标注列表 -->