From 52b94299962d7b770fa858e5960cb9e85da51d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E9=BE=99=20=E7=8E=8B?= <w15604079545@outlook.com>
Date: Wed, 27 Nov 2024 15:27:16 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E8=8E=B7=E5=8F=96=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=BD=B4=E8=BD=A8=E8=BF=B9=E6=8E=92=E5=BA=8F=E5=8F=82=E7=85=A7?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=BB=A5=E3=80=90=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E5=8F=91=E7=94=9F=E6=97=B6=E9=97=B4=E3=80=91=E5=8F=82=E8=80=83?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E8=8B=A5=E3=80=90=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E5=8F=91=E7=94=9F=E6=97=B6=E9=97=B4=E3=80=91=E5=92=8C=E3=80=90?=
 =?UTF-8?q?=E5=8F=91=E7=94=9F=E6=97=B6=E5=8C=BA=E3=80=91=E4=BB=BB=E4=B8=80?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=88=99=E4=BB=A5=E3=80=90=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=91=E4=B8=BA=E5=8F=82=E8=80=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/TrackOrders/TrackOrderService.cs            | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
index 2d856921..75806f9e 100644
--- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
+++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
@@ -205,13 +205,18 @@ public class TrackOrderService : ApplicationService
             if (system.SystemProperty == 2 && !item.IsVisibility)
                 continue;
 
+            //时间和时区任意一个为空则使用创建时间做为排序参照值
+            var timeTick = ToUnixTimestamp((item.TrackTime == null
+                                            || Math.Abs(item.TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1)
+                ? item.CreateTime
+                : item.TrackTime);
             res.Data.Add(new GetDetailTimelineOutput()
             {
                 IsHighlight = true,
                 IsShowHover = true,
                 Remark = item.Remarks == null || item.Remarks == "--" ? "" : item.Remarks,
                 TrackTimeZone = $"GMT{(item.TrackTimeZone >= 0 ? "+" : "-")}{GetTimeZoneStr(item.TrackTimeZone)}",
-                TrackTime = ToUnixTimestamp(item.TrackTime),
+                TrackTime = timeTick,
                 TrackPlace = item.TrackPlace,
                 EnContent = item.TrackEnContent,
                 Files = item.Files == null
@@ -231,7 +236,7 @@ public class TrackOrderService : ApplicationService
         }
 
         // 按轨迹发生时间正序排序
-        res.Data = res.Data?.OrderBy(m => m.TrackTime).ToList();
+        res.Data = res.Data.OrderBy(m => m.TrackTime).ToList();
 
         if (!order.IsCompleted) //如果没完结则显示签收节点
         {