Parcourir la source

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

Dun.Jason il y a 8 mois
Parent
commit
99f83cbcab

+ 1 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -3194,7 +3194,7 @@ public class OrderController : BaseController
         }
 
         //是否市州互转 
-        await _publisher.PublishAsync(new TranspondCityNotify(order.Id), PublishStrategy.ParallelNoWait, HttpContext.RequestAborted);
+        //await _publisher.PublishAsync(new TranspondCityNotify(order.Id), PublishStrategy.ParallelWhenAll, HttpContext.RequestAborted);
     }
 
     /// <summary>

+ 8 - 0
src/Hotline.Application/JudicialManagement/EnforcementApplication.cs

@@ -68,6 +68,10 @@ namespace Hotline.Application.JudicialManagement
             if (order.AcceptTypeCode != "35")
                 return;
 
+            //如果部门为空排除
+            if (string.IsNullOrEmpty(order.OrgLevelOneName) || string.IsNullOrEmpty(order.OrgLevelOneCode))
+                return;
+
             //如果没开启则不处理
             var isOpenJudicialManagement = _systemSettingCacheManager.GetSetting(SettingConstants.IsOpenJudicialManagement)?.SettingValue[0];
             if (isOpenJudicialManagement != "true")
@@ -142,6 +146,10 @@ namespace Hotline.Application.JudicialManagement
             if (order.AcceptTypeCode != "35")
                 return;
 
+            //如果部门为空排除
+            if (string.IsNullOrEmpty(order.OrgLevelOneName) || string.IsNullOrEmpty(order.OrgLevelOneCode))
+                return;
+
             //如果没开启则不处理
             var isOpenJudicialManagement = _systemSettingCacheManager.GetSetting(SettingConstants.IsOpenJudicialManagement)?.SettingValue[0];
             if (isOpenJudicialManagement != "true")