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

src/Hotline/Orders/OrderDomainService.cs

@@ -187,13 +187,13 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
 		DateTime time = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
 		//根据当前时间获取排班信息
 		var scheduling = await _schedulingRepository.Queryable().Includes(x => x.SchedulingUser)
-			.Where(x => x.SchedulingTime == time && x.WorkingTime <= DateTime.Now.TimeOfDay && x.OffDutyTime >= DateTime.Now.TimeOfDay && x.AtWork!.Value)
-			.OrderBy(x => x.SendOrderNum).FirstAsync();
+			.Where(x => x.SchedulingTime == time && x.WorkingTime <= DateTime.Now.TimeOfDay && x.OffDutyTime >= DateTime.Now.TimeOfDay && x.AtWork!.Value == true)
+			.OrderBy(x => x.SendOrderNum).FirstAsync(cancellationToken);
 		if (scheduling != null)
 		{
-			user = await _userRepository.GetAsync(x => x.Id == scheduling.SchedulingUser.UserId);
+			user = await _userRepository.GetAsync(x => x.Id == scheduling.SchedulingUser.UserId, cancellationToken);
 			scheduling.SendOrderNum++;
-			await _schedulingRepository.UpdateAsync(scheduling);
+			await _schedulingRepository.UpdateAsync(scheduling, cancellationToken);
 		}
 		List<Kv> res = new List<Kv>();
 		res.Add(new Kv { Key = user.Id, Value = user.Name });
@@ -245,7 +245,7 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
 		//3.平均分配剩下的工单给今天上班的人
 		DateTime time = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
 		var schedulings = await _schedulingRepository.Queryable().Includes(x => x.SchedulingUser)
-			.Where(x => x.SchedulingTime == time && x.WorkingTime <= DateTime.Now.TimeOfDay && x.OffDutyTime >= DateTime.Now.TimeOfDay && x.AtWork!.Value)
+			.Where(x => x.SchedulingTime!.Value == time && x.WorkingTime!.Value <= DateTime.Now.TimeOfDay && x.OffDutyTime!.Value >= DateTime.Now.TimeOfDay && x.AtWork!.Value == true)
 			.OrderBy(x => x.SendOrderNum).ToListAsync(cancellationToken);
 
 		if (schedulings.Any())