diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
index 278667aa..277ad96b 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
@@ -60,9 +60,9 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                 }).ToArray();
                 nextEvent.TrackRefreshData = new TrackRefreshStruct
                 {
-                    ServiceProviderName = @event.TrackRefreshData.ServiceProviderName ?? GlobalConst.EmptyString,
-                    OriginTrackContent = @event.TrackRefreshData.OriginTrackContent ?? GlobalConst.EmptyString,
-                    OriginTrackData = @event.TrackRefreshData.OriginTrackData ?? GlobalConst.EmptyString,
+                    ServiceProviderName = @event.TrackRefreshData.ServiceProviderName,
+                    OriginTrackContent = @event.TrackRefreshData.OriginTrackContent,
+                    OriginTrackData = @event.TrackRefreshData.OriginTrackData,
                     // tips：一定要重置为false，父级订单的完成不会使得关联订单完成，关联单也必须由刷新来完成或手动设置完成！！
                     IsCompleted = false
                 };
@@ -118,9 +118,9 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                     TrackPlace = @event.TrackPlace,
                     TrackTime = @event.TrackTime,
                     TrackTimeZone = @event.TrackTimeZone,
-                    ServiceProviderName = @event.TrackRefreshData.ServiceProviderName,
-                    OriginTrackContent = @event.TrackRefreshData.OriginTrackContent,
-                    OriginTrackData = @event.TrackRefreshData.OriginTrackData,
+                    ServiceProviderName = @event.TrackRefreshData.ServiceProviderName ?? GlobalConst.EmptyString,
+                    OriginTrackContent = @event.TrackRefreshData.OriginTrackContent ?? GlobalConst.EmptyString,
+                    OriginTrackData = @event.TrackRefreshData.OriginTrackData ?? GlobalConst.EmptyString,
                     IsCanDelete = false,
                     CreateUser = @event.OperationMan ?? GlobalConst.SystemUser,
                     CreateTime = DateTime.Now
diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
index b692a3f2..d1345e90 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
@@ -2,7 +2,6 @@ using Nest;
 using SJZY.Expand.ABP.Core.Logger;
 using SJZY.Expand.ElasticSearch.Services;
 using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
-using SJZY.Track.Domain.Consts;
 using SJZY.Track.Domain.Dtos.TrackDetails;
 
 namespace SJZY.Track.Repository.Repositories;
@@ -18,12 +17,13 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
     {
         var r = await Context.SearchAsync<TrackDetailsIndex>(s => s
             .Source()
-            .Query(q =>
-                q.Terms(t => t
-                    .Field(f => f.OrderId)
-                    .Terms(orderIds))
-                && q.Term(f => f.TrackCode.Suffix("keyword"), trackCode)
-                && q.Term(f => f.ServiceProviderName.Suffix("keyword"), GlobalConst.EmptyString)
+            .Query(q => q
+                .Bool(b => b
+                    .Must(
+                        mu => mu.Terms(t => t.Field(f => f.OrderId).Terms(orderIds)),
+                        mu => mu.Term(t => t.Field(f => f.TrackCode.Suffix("keyword")).Value(trackCode))
+                    )
+                )
             )
         );
 
@@ -41,11 +41,18 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
                 .Field(f => f.TrackTimeZone)
                 .Field(f => f.OrderId)
             ))
-            .Query(q =>
-                q.Terms(t => t
-                    .Field(f => f.OrderId)
-                    .Terms(orderIds))
-                && q.Term(f => f.ServiceProviderName.Suffix("keyword"), GlobalConst.EmptyString)
+            .Query(q => q
+                .Bool(b => b
+                    .Must(
+                        mu => mu.Terms(t => t.Field(f => f.OrderId).Terms(orderIds))
+                    )
+                    .MustNot(mn => mn
+                        .Term(t => t
+                            .Field(f => f.TrackCode.Suffix("keyword"))
+                            .Value("--")
+                        )
+                    )
+                )
             )
             .Sort(s => s.Field(f => f.TrackTime, SortOrder.Descending))
             .Size(1)