From 888659deae81c6dd94568d0b25a7cdcc9e2e15f0 Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Thu, 12 Feb 2026 15:34:47 +0800
Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9Abug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/airline/domain/uitl/WayPointUitls.java    | 5 ++++-
 .../resources/mapper/airline/AirlineFileGroupInfoMapper.xml  | 1 +
 src/main/resources/mapper/airline/AirlineFileGroupMapper.xml | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/airline/domain/uitl/WayPointUitls.java b/src/main/java/com/ruoyi/airline/domain/uitl/WayPointUitls.java
index 4d73b85..e205597 100644
--- a/src/main/java/com/ruoyi/airline/domain/uitl/WayPointUitls.java
+++ b/src/main/java/com/ruoyi/airline/domain/uitl/WayPointUitls.java
@@ -33,10 +33,13 @@ public class WayPointUitls {
         KmlMissionConfig missionConfig = kmlInfo.getDocument().getKmlMissionConfig();
         //其他场景下都可以从missionConfig 拿航点和动作集合
         List<KmlPlacemark> placeMarkList = kmlInfo.getDocument().getFolder().getPlacemarkList();
+
+        if (placeMarkList == null || placeMarkList.isEmpty()) {
+            return "";
+        }
         //获取kml文件中的第一个坐标
         String[] takeoffCoords;
         if (missionConfig.getTakeOffRefPoint() != null) {
-
             takeoffCoords = missionConfig.getTakeOffRefPoint().split(",");
         } else {
             // M300/M350：使用第一个航点的坐标
diff --git a/src/main/resources/mapper/airline/AirlineFileGroupInfoMapper.xml b/src/main/resources/mapper/airline/AirlineFileGroupInfoMapper.xml
index a118959..6b5dd73 100644
--- a/src/main/resources/mapper/airline/AirlineFileGroupInfoMapper.xml
+++ b/src/main/resources/mapper/airline/AirlineFileGroupInfoMapper.xml
@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="airlineId != null">
             and airline_id = #{airlineId}
         </if>
+        order by update_time desc
     </select>
 
     <!-- 删除分组详情（软删除） -->
diff --git a/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml b/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml
index 64094d8..241fa58 100644
--- a/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml
+++ b/src/main/resources/mapper/airline/AirlineFileGroupMapper.xml
@@ -105,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join (
             select afgi.group_id, count(afgi.id) as count
             from airline_file_group_info afgi
+            WHERE afgi.del_flag = 0
             group by afgi.group_id
         ) airline_count on afg.group_id = airline_count.group_id
         <where>
@@ -116,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and afg.user_id = #{userId}
             </if>
         </where>
-        order by afg.create_time desc
+        order by afg.update_time desc
     </select>