From 3bbd63325978b12e7378f6f0f14f375340167d70 Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Tue, 15 Apr 2025 09:35:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A5=E5=85=85=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=90=8C=E6=AD=A5=E5=89=8D=E7=BD=AE=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CAP/EventHandlers/TrackUpsertEventHandler.cs           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
index 030eb361..9ddd0b87 100644
--- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
@@ -297,14 +297,17 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                 ? existTracks.Where(x => x.GetUtc0TrackTime() == (@event.NewTrackTime ?? @event.TrackTime).Subtract(TimeSpan.FromHours(timezone))).ToList()
                 : existTracks.Where(x =>
                     x.GetUtc0TrackTime() == @event.TrackTime.Subtract(TimeSpan.FromHours(timezone))
-                    // 修改了并且修改了时间
+                    // 修改了时间，要校验修改后的时间是否存在
                     || (@event.NewTrackTime != null && x.GetUtc0TrackTime() == @event.NewTrackTime.Value.Subtract(TimeSpan.FromHours(timezone)))
                 ).ToList();
 
             // 根据扩展信息过滤
             existTracks = @event.IsAdd
                 ? existTracks.Where(x => x.Extra == (@event.NewExtra ?? @event.Extra)).ToList()
-                : existTracks.Where(x => x.Extra == @event.Extra || x.Extra == @event.NewExtra).ToList();
+                : existTracks.Where(x =>
+                    x.Extra == @event.Extra
+                    // 修改了extra，要校验修改后的extra是否存在
+                    || (!string.IsNullOrWhiteSpace(@event.NewExtra) && x.Extra == @event.NewExtra)).ToList();
 
             if (@event.IsAdd)
             {