From b2c7a6aef103d991afbfc4d5fb248dacf44ed167 Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Fri, 10 Jan 2025 09:18:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84=E6=AF=94=E8=BE=83=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=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             | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
index 0f68fcda..79ece4b4 100644
--- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
@@ -272,8 +272,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
 
                 existTracks = existTracks.Where(x =>
                 {
+                    var oldExtraDict = GetExtraDictForTextJson(x.Extra);
                     // tips：注意兼容性，历史轨迹的字段可能为空
-                    if (x.Extra == null || !extraDict.TryGetValue(@event.CompareFields, out var oldValue))
+                    if (x.Extra == null
+                        || oldExtraDict == null
+                        || !oldExtraDict.TryGetValue(@event.CompareFields, out var oldValue))
                     {
                         return false;
                     }