From 08f4ecc9375c3058dd28c647ebe3cc7c12ff8f02 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 15 三月 2026 21:01:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpTaskMapper.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpTaskMapper.xml b/xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpTaskMapper.xml
index 10ad823..45737a8 100644
--- a/xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpTaskMapper.xml
+++ b/xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpTaskMapper.xml
@@ -86,15 +86,19 @@
 
         <if test="query.sortType != null">
             <if test="query.sortType == 1">
-                order by t1.task_urgency_level, t1.create_time desc
+                <if test="query.sortRule == 1">
+                    order by  t1.task_urgency_level asc, t1.create_time desc
+                </if>
                 <if test="query.sortRule == 2">
-                    desc, t1.create_time desc
+                    order by  t1.task_urgency_level desc, t1.create_time desc
                 </if>
             </if>
             <if test="query.sortType == 2">
-                order by t2.plate_number, t1.create_time desc
+                <if test="query.sortRule == 1">
+                    order by t2.plate_number, t1.create_time desc
+                </if>
                 <if test="query.sortRule == 2">
-                    desc, t1.create_time desc
+                    order by t2.plate_number desc, t1.create_time desc
                 </if>
             </if>
             <if test="query.sortType == 3">

--
Gitblit v1.7.1