Merge branch 'dev' of http://110.188.24.182:10023/Fengwo/hotline into dev

src/Hotline.Api/Controllers/HomeController.cs

@@ -184,6 +184,7 @@ public class HomeController : BaseController
 			IsTranspondCity = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.TranspondCity).SettingValue[0]),
 			IsAverageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]),
             IsOpenJudicialManagement = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.IsOpenJudicialManagement).SettingValue[0]),
+            NoSignOrgCode = _systemSettingCacheManager.GetSetting(SettingConstants.NoSignOrgCode).SettingValue,
         };
         return rsp;
     }

src/Hotline.Api/Controllers/OrderController.cs

@@ -5122,7 +5122,7 @@ public class OrderController : BaseController
         await _orderRepository.UpdateAsync(orderData, HttpContext.RequestAborted);
 
         //向省上推送数据
-        if (dto.IsPush)
+        if (dto.IsPush && orderData.Status > EOrderStatus.WaitForAccept)
         {
             var orderDto = _mapper.Map<OrderDto>(orderData);
             await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto, cancellationToken: HttpContext.RequestAborted);

src/XF.Domain/Constants/SettingConstants.cs

@@ -227,7 +227,10 @@ namespace XF.Domain.Constants
         /// </summary>
         public const string IsRecallToSeatDesignated = "IsRecallToSeatDesignated";
 
-
+        /// <summary>
+        /// 不参与会签的部门
+        /// </summary>
+        public const string NoSignOrgCode = "NoSignOrgCode";
         #region 智能外呼
 
         #region 智能回访