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

src/Hotline.Api/Controllers/OrderController.cs

@@ -6908,10 +6908,9 @@ public class OrderController : BaseController
 
             if (!order.FileOrgIsCenter.Value)
             {
-				 //&& x.StepType == EStepType.Normal
 				if (step.Steps.Where(x => x.BusinessType == EBusinessType.Department && x.OrgLevel == 1).Any())
                 {
-                    var stepdDefault = step.Steps.Where(x => x.BusinessType == EBusinessType.Department && x.OrgLevel == 1)
+                    var stepdDefault = step.Steps.Where(x => x.BusinessType == EBusinessType.Department && x.OrgLevel == 1 && x.StepType == EStepType.Normal)
                         .FirstOrDefault();
                     defaultStepKey = stepdDefault.Key;
                     defaultHandlerKey = stepdDefault.Handler.Key;

src/Hotline.Application/Orders/OrderApplication.cs

@@ -865,7 +865,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 		var query = _orderRepository.Queryable()
             .Includes(order => order.OrderPublish)
             .LeftJoin<User>((order, user) => order.WaitForPublisherId == user.Id)
-            .Where((order, user) => order.CreationTime >= dto.StartTime && order.CreationTime <= dto.EndTime &&
+            .Where((order, user) => order.OrderPublish.CreationTime >= dto.StartTime && order.OrderPublish.CreationTime <= dto.EndTime &&
                                     !string.IsNullOrEmpty(order.WaitForPublisherId))
             //  .WhereIF(dto.ProcessType != null, (order, user) => order.ProcessType == dto.ProcessType)
             .WhereIF(dto.ProcessType != null && dto.ProcessType == EProcessType.Zhiban, (order, user) => order.FileOrgIsCenter == true)