From 569aeece66bc120056c84b944f1e75817c0a1a5f Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Mon, 24 Mar 2025 11:46:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=97=B6=E8=BD=A8=E8=BF=B9=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4=E7=9A=84=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=20fix:=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E6=97=B6=E6=95=88=E9=A2=84=E8=AD=A6=E6=98=8E=E7=BB=86=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E8=BD=A8=E8=BF=B9=E5=8F=91=E7=94=9F=E5=9C=B0=E5=8F=8D?=
 =?UTF-8?q?=E5=8F=82=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CAP/EventHandlers/TrackUpsertEventHandler.cs          | 8 ++++----
 .../Services/Warning/TransportWarningService.cs           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
index 827966a8..a4e93ec2 100644
--- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
@@ -386,8 +386,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
 
         //允许二次修改，在修改了轨迹内容后进行修改轨迹操作，如果输入的轨迹内容则以输入为准
         //跨子系统?
-        track.TrackContent = @event.Content ?? trackContent.TrackContent;
-        track.TrackEnContent = @event.EnStatus ?? trackContent.TrackEnContent;
+        track.TrackContent = string.IsNullOrWhiteSpace(@event.Content) ? trackContent.TrackContent : @event.Content;
+        track.TrackEnContent = string.IsNullOrWhiteSpace(@event.EnStatus) ? trackContent.TrackEnContent : @event.EnStatus;
         //S06新增
         track.IsVisibility = @event.IsVisibility;
         //当传入的IsExternal为空，则使用轨迹内容中的IsExternal
@@ -435,8 +435,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
             TrackStatusCode = trackContent.TrackStatusCode,
             //跨子系统?
             TrackContentId = trackContent.TrackContentId,
-            TrackContent = @event.Content ?? trackContent.TrackContent,
-            TrackEnContent = @event.EnStatus ?? trackContent.TrackEnContent,
+            TrackContent = string.IsNullOrWhiteSpace(@event.Content) ? trackContent.TrackContent : @event.Content,
+            TrackEnContent = string.IsNullOrWhiteSpace(@event.EnStatus) ? trackContent.TrackEnContent : @event.EnStatus,
             //S06新增轨迹明细字段
             IsVisibility = @event.IsVisibility,
             //当传入的IsExternal为空，则使用轨迹内容中的IsExternal
diff --git a/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs b/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs
index fd54a481..f60471a1 100644
--- a/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs
+++ b/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs
@@ -224,7 +224,7 @@ public class TransportWarningService : ApplicationService
                 LatestTrackContent = orderIdTrack?.TrackContent,
                 LatestTrackTime = orderIdTrack?.TrackTime,
                 LatestTrackTimeZone = FormatTimeZone(orderIdTrack?.TrackTimeZone),
-                LatestTrackPlace = orderIdTrack?.TrackContent,
+                LatestTrackPlace = orderIdTrack?.TrackPlace,
 
                 // 起始轨迹
                 StartTrackStatus = x.StartTrackStatus,