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

src/Hotline.Api/Controllers/OrderController.cs

@@ -2506,8 +2506,9 @@ public class OrderController : BaseController
 
         try
         {
-            // 平均派单
-            if (dto.Workflow.BusinessType == EBusinessType.Send)
+			// 平均派单
+			var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
+			if (dto.Workflow.BusinessType == EBusinessType.Send && averageSendOrder)
             {
                 dto.Workflow.NextHandlers = await _orderDomainService.AverageOrder(HttpContext.RequestAborted);
             }

src/Hotline.Api/Controllers/SettingController.cs

@@ -164,7 +164,7 @@ namespace Hotline.Api.Controllers
         /// <param name="year"></param>
         /// <param name="month"></param>
         /// <returns></returns>
-        [Permission(EPermission.DaySetingsList)]
+        //[Permission(EPermission.DaySetingsList)]
         [HttpGet("getdaysettings-month/{year}/{month}")]
         public async Task<List<DaySetting>> GetDaySettingsByMonth(int year,int month)
         {

src/Hotline/Orders/OrderDomainService.cs

@@ -183,7 +183,7 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
     /// <returns></returns>
     public async Task<List<Kv>> AverageOrder(CancellationToken cancellationToken)
     {
-        var user = await _userRepository.Queryable().Where(x => x.Id == OrderDefaults.SourceChannel.SendPoolId).FirstAsync(cancellationToken);
+        var user = await _userRepository.Queryable(includeDeleted:true).Where(x => x.Id == OrderDefaults.SourceChannel.SendPoolId).FirstAsync(cancellationToken);
         DateTime time = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
         //根据当前时间获取排班信息
         var scheduling = await _schedulingRepository.Queryable().Includes(x => x.SchedulingUser)