Merge branch 'test' into lib/test

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -402,16 +402,24 @@ namespace Hotline.FlowEngine.Workflows
                     }
                     else
                     {
-                        //todo 指派给配置的角色
-                        //dto.FlowAssignType = EFlowAssignType.Role;
-                        dto.NextHandlers.Add(new StepAssignInfo
+                        var orgid = nextStepDefine.BusinessType ==  EBusinessType.Seat ||
+									nextStepDefine.BusinessType == EBusinessType.Send ||
+									nextStepDefine.BusinessType == EBusinessType.CenterMonitor ||
+									nextStepDefine.BusinessType == EBusinessType.CenterLeader
+							? OrgSeedData.CenterId
+							: null;
+						//todo 指派给配置的角色
+						//dto.FlowAssignType = EFlowAssignType.Role;
+						dto.NextHandlers.Add(new StepAssignInfo
                         {
                             Key = handler.Key,
                             Value = handler.Value,
                             RoleId = handler.Key,
                             RoleName = handler.Value,
+                            OrgId = orgid,
                             FlowAssignType = EFlowAssignType.Role
                         });
+                       
                     }
                 }
             }

src/Hotline/Orders/OrderDomainService.cs

@@ -567,9 +567,10 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
 
     public async Task<bool> SchedulingAtWork(string UserId) 
     {
-        var atWork =  await _schedulingRepository.Queryable()
+		var time = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
+		var atWork =  await _schedulingRepository.Queryable()
 			.Includes(x => x.SchedulingUser)
-			.Where(x => x.SchedulingUser.UserId == UserId && x.WorkingTime <= DateTime.Now.TimeOfDay && x.OffDutyTime >= DateTime.Now.TimeOfDay && x.AtWork == true)
+			.Where(x => x.SchedulingUser.UserId == UserId && x.SchedulingTime == time && x.WorkingTime <= DateTime.Now.TimeOfDay && x.OffDutyTime >= DateTime.Now.TimeOfDay && x.AtWork == true)
 			.AnyAsync();
         return atWork;
 	}