Jelajahi Sumber

Merge branch 'release' of http://git.12345lm.cn/Fengwo/hotline into release

qinchaoyue 6 bulan lalu
induk
melakukan
1118a11d71
1 mengubah file dengan 6 tambahan dan 3 penghapusan
  1. 6 3
      src/Hotline.Application/Jobs/XingTangCallsSyncJob.cs

+ 6 - 3
src/Hotline.Application/Jobs/XingTangCallsSyncJob.cs

@@ -51,12 +51,14 @@ namespace Hotline.Application.Jobs
         public async Task Execute(IJobExecutionContext context)
         {
             var xingtangCalls = await _db.Queryable<XingtangCall>()
-                .Where(d => (d.IsSync == null || !d.IsSync) && (d.Tries == null || d.Tries <= 50))
+                .Where(d => !string.IsNullOrEmpty(d.CallGuid) &&
+                                (d.IsSync == null || !d.IsSync) &&
+                                (d.Tries == null || d.Tries <= 50))
                 .OrderBy(d => d.Id)
                 .Take(10)
                 .ToListAsync(context.CancellationToken);
 
-            if(!xingtangCalls.Any()) return;
+            if (!xingtangCalls.Any()) return;
             var occupyCalls = new List<XingtangCall>();
             foreach (var call in xingtangCalls)
             {
@@ -69,7 +71,7 @@ namespace Hotline.Application.Jobs
                     occupyCalls.Add(call);
             }
 
-            if(!occupyCalls.Any()) return;
+            if (!occupyCalls.Any()) return;
             try
             {
                 var calls = _mapper.Map<List<CallNative>>(occupyCalls);
@@ -122,6 +124,7 @@ namespace Hotline.Application.Jobs
 
         private async Task<string> GetCallIdAsync(string callNo, CancellationToken cancellation)
         {
+            if (string.IsNullOrEmpty(callNo)) return string.Empty;
             var relation = await _callApplication.GetRelationAsync(callNo, cancellation);
             if (relation is null)
             {