diff --git a/src/TrackCenter.Application/Dtos/TrackContents/EditTrackContentMapInput.cs b/src/TrackCenter.Application/Dtos/TrackContents/EditTrackContentMapInput.cs
index 831375d0..02d00462 100644
--- a/src/TrackCenter.Application/Dtos/TrackContents/EditTrackContentMapInput.cs
+++ b/src/TrackCenter.Application/Dtos/TrackContents/EditTrackContentMapInput.cs
@@ -7,7 +7,7 @@ public class EditTrackContentMapInput
     /// <summary>
     /// 映射应用
     /// </summary>
-    public int? MapAppKey { get; set; }
+    public string? MapAppKey { get; set; }
 
     /// <summary>
     /// 映射轨迹内容代码
@@ -27,7 +27,7 @@ public class EditTrackContentMapInput
     /// <summary>
     /// 源应用
     /// </summary>
-    public int? AppKey { get; set; }
+    public string? AppKey { get; set; }
 
     /// <summary>
     /// 源轨迹内容代码
diff --git a/src/TrackCenter.Application/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs b/src/TrackCenter.Application/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs
index 844d2184..3c397682 100644
--- a/src/TrackCenter.Application/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs
+++ b/src/TrackCenter.Application/Dtos/Warning/Complete/GetPageCompleteWarningDetailsInput.cs
@@ -10,7 +10,7 @@ public class GetPageCompleteWarningDetailsInput : PageInfoInput
     /// <summary>
     /// 应用
     /// </summary>
-    public int? AppKey { get; set; }
+    public string? AppKey { get; set; }
 
     /// <summary>
     /// 订单号，限制1000个
diff --git a/src/TrackCenter.Application/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs b/src/TrackCenter.Application/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs
index 372ddca4..e7609916 100644
--- a/src/TrackCenter.Application/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs
+++ b/src/TrackCenter.Application/Dtos/Warning/Return/GetPageReturnWarningDetailsInput.cs
@@ -10,7 +10,7 @@ public class GetPageReturnWarningDetailsInput : PageInfoInput
     /// <summary>
     /// 应用
     /// </summary>
-    public int? AppKey { get; set; }
+    public string? AppKey { get; set; }
 
     /// <summary>
     /// 订单号，限制1000个
@@ -32,7 +32,7 @@ public class GetPageReturnWarningDetailsInput : PageInfoInput
     /// <summary>
     /// 客户
     /// </summary>
-    public string Customer { get; set; }
+    public string? Customer { get; set; }
 
     /// <summary>
     /// 轨迹状态id
diff --git a/src/TrackCenter.Application/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs b/src/TrackCenter.Application/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs
index 496a58ec..553c6866 100644
--- a/src/TrackCenter.Application/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs
+++ b/src/TrackCenter.Application/Dtos/Warning/Transport/GetPageTransportWarningDetailsInput.cs
@@ -10,7 +10,7 @@ public class GetPageTransportWarningDetailsInput : PageInfoInput
     /// <summary>
     /// 应用
     /// </summary>
-    public int? AppKey { get; set; }
+    public string? AppKey { get; set; }
 
     /// <summary>
     /// 订单号，限制1000个
@@ -31,7 +31,7 @@ public class GetPageTransportWarningDetailsInput : PageInfoInput
     /// <summary>
     /// 客户
     /// </summary>
-    public string Customer { get; set; }
+    public string? Customer { get; set; }
 
     /// <summary>
     /// 预警名称
diff --git a/src/TrackCenter.Domain/Dtos/Forewarning/QueryAreaRequest.cs b/src/TrackCenter.Domain/Dtos/Forewarning/QueryAreaRequest.cs
index 7112e0de..c921b4c4 100644
--- a/src/TrackCenter.Domain/Dtos/Forewarning/QueryAreaRequest.cs
+++ b/src/TrackCenter.Domain/Dtos/Forewarning/QueryAreaRequest.cs
@@ -10,5 +10,5 @@ public class QueryAreaRequest : PageInfoInput
     /// <summary>
     /// 应用
     /// </summary>
-    public int? AppKey { get; set; }
+    public string? AppKey { get; set; }
 }
diff --git a/src/TrackCenter.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs b/src/TrackCenter.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs
index 57198959..fad24a15 100644
--- a/src/TrackCenter.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs
+++ b/src/TrackCenter.Domain/Dtos/Warning/GetPageCompleteWarningDetailsInputVO.cs
@@ -5,7 +5,7 @@ public class GetPageCompleteWarningDetailsInputVO : PageInfoInput
     /// <summary>
     /// 应用
     /// </summary>
-    public int? AppKey { get; set; }
+    public string? AppKey { get; set; }
 
     /// <summary>
     /// 订单号
@@ -26,7 +26,7 @@ public class GetPageCompleteWarningDetailsInputVO : PageInfoInput
     /// <summary>
     /// 客户
     /// </summary>
-    public string Customer { get; set; }
+    public string? Customer { get; set; }
 
     /// <summary>
     /// 缺失轨迹状态id
diff --git a/src/TrackCenter.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs b/src/TrackCenter.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs
index 091c577e..b1c0201f 100644
--- a/src/TrackCenter.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs
+++ b/src/TrackCenter.Domain/Dtos/Warning/GetPageReturnWarningDetailsInputVO.cs
@@ -8,7 +8,7 @@ public class GetPageReturnWarningDetailsInputVO : PageInfoInput
     /// <summary>
     /// 应用
     /// </summary>
-    public int? AppKey { get; set; }
+    public string? AppKey { get; set; }
 
     /// <summary>
     /// 订单号
diff --git a/src/TrackCenter.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs b/src/TrackCenter.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs
index aea537d0..a4aa202a 100644
--- a/src/TrackCenter.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs
+++ b/src/TrackCenter.Domain/Dtos/Warning/GetPageTransportWarningDetailsInputVO.cs
@@ -8,7 +8,7 @@ public class GetPageTransportWarningDetailsInputVO : PageInfoInput
     /// <summary>
     /// 应用
     /// </summary>
-    public int? AppKey { get; set; }
+    public string? AppKey { get; set; }
 
     /// <summary>
     /// 订单号
@@ -28,7 +28,7 @@ public class GetPageTransportWarningDetailsInputVO : PageInfoInput
     /// <summary>
     /// 客户
     /// </summary>
-    public string Customer { get; set; }
+    public string? Customer { get; set; }
 
     /// <summary>
     /// 预警名称
diff --git a/src/TrackCenter.Repository/Repositories/WarningDetailsEsRepository.cs b/src/TrackCenter.Repository/Repositories/WarningDetailsEsRepository.cs
index 3fd3d3c5..10c7028a 100644
--- a/src/TrackCenter.Repository/Repositories/WarningDetailsEsRepository.cs
+++ b/src/TrackCenter.Repository/Repositories/WarningDetailsEsRepository.cs
@@ -37,7 +37,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
             c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos)));
         musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType));
         musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status));
-        musts.AddIf(x => x.AppKey > 0, c => c.Term(f => f.AppKey, input.AppKey));
+        musts.AddIf(x => !x.AppKey.IsNullOrWhiteSpace(), c => c.Term(f => f.AppKey, input.AppKey));
         musts.AddIf(x => !string.IsNullOrWhiteSpace(x.WarningName),
             c => c.Match(f => f.Field(d => d.WarningName).Query(input.WarningName)));
         musts.AddIf(x => x.CreateTimeStart.HasValue,
@@ -355,7 +355,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
             ListWrapperFactory.CreateListWrapper<ReturnWarningDetailsIndex, GetPageReturnWarningDetailsInputVO>(input);
 
         // 精确匹配
-        musts.AddIf(x => x.AppKey > 0, c => c.Term(f => f.AppKey, input.AppKey));
+        musts.AddIf(x => !x.AppKey.IsNullOrWhiteSpace(), c => c.Term(f => f.AppKey, input.AppKey));
         musts.AddIf(x => x.OrderNos?.Count > 0,
             c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos)));
         musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType));
@@ -738,7 +738,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
         var musts = ListWrapperFactory
             .CreateListWrapper<CompleteWarningDetailsIndex, GetPageCompleteWarningDetailsInputVO>(input);
 
-        musts.AddIf(x => x.AppKey > 0, c => c.Term(f => f.AppKey, input.AppKey));
+        musts.AddIf(x => !x.AppKey.IsNullOrWhiteSpace(), c => c.Term(f => f.AppKey, input.AppKey));
         musts.AddIf(x => x.OrderNos?.Count > 0,
             c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos)));
         musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType));