From c0b167404dbc4e98ccb8b84f94f48c96bcb3df02 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 12 Dec 2025 09:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
index f1c5619..8d5f081 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
@@ -8,6 +8,7 @@
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
         <result property="path"    column="path"    />
+        <result property="path1"    column="path1"    />
         <result property="groupId"    column="group_id"    />
         <result property="type"    column="type"    />
         <result property="aircraft"    column="aircraft"    />
@@ -25,6 +26,7 @@
         select id,
                name,
                path,
+               path1,
                group_id,
                type,
                aircraft,
@@ -49,6 +51,9 @@
             <if test="path != null  and path != ''"> and path = #{path}</if>
             <if test="groupId != null"> and group_id = #{groupId}</if>
         </where>
+        <if test="orderByTime == null and orderByTime == ''">
+            ORDER BY update_time DESC
+        </if>
         <!-- 动态排序 -->
         <if test="orderByTime != null and orderByTime != ''">
             ORDER BY update_time ${orderByTime}
@@ -66,6 +71,7 @@
             <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="path != null">path,</if>
+            <if test="path1 != null">path1,</if>
             <if test="groupId != null">group_id,</if>
             <if test="type != null">type,</if>
             <if test="aircraft != null">aircraft,</if>
@@ -82,6 +88,7 @@
             <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="path != null">#{path},</if>
+            <if test="path1 != null">#{path1},</if>
             <if test="groupId != null">#{groupId},</if>
             <if test="type != null">#{type},</if>
             <if test="aircraft != null">#{aircraft},</if>
@@ -101,6 +108,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
             <if test="path != null">path = #{path},</if>
+            <if test="path1 != null">path1 = #{path1},</if>
             <if test="groupId != null">group_id = #{groupId},</if>
             <if test="type != null">type = #{type},</if>
             <if test="aircraft != null">aircraft = #{aircraft},</if>
@@ -140,7 +148,7 @@
     </delete>
 
     <select id="selectArdRouteInfoByGroupId" parameterType="String" resultMap="ArdRouteInfoResult">
-        select id,name,path,group_id,type,aircraft,payload,read_only,create_by,create_time,update_by,update_time,point_count from ard_route_info
+        select id,name,path,path1,group_id,type,aircraft,payload,read_only,create_by,create_time,update_by,update_time,point_count from ard_route_info
         <where>
             <if test="groupId != null "> and group_id = #{groupId}</if>
         </where>

--
Gitblit v1.9.3