部门超期

src/Hotline.Application/Orders/OrderApplication.cs

@@ -699,7 +699,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 				(x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.FiledTime) || (x.Status < EOrderStatus.Filed && x.ExpiredTime < SqlFunc.GetDate()))
             .WhereIF(IsCenter == false, x => x.ActualHandleOrgCode == _sessionContext.RequiredOrgId)
 			.WhereIF(!string.IsNullOrEmpty(dto.OrgName)  , x => x.AcceptorOrgName == dto.OrgName)
-			.MergeTable();
+			.Select( x => new Order { DaysOverdueOrgName = x.ActualHandleOrgCode, Id = x.Id.SelectAll() });
 
         var queryCountersign = _workflowStepRepository.Queryable()
 	        .Includes(x => x.Workflow)
@@ -708,11 +708,11 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .Where(x => (x.Status == Share.Enums.FlowEngine.EWorkflowStepStatus.Handled && x.StepExpiredTime < x.HandleTime)||(x.Status != Share.Enums.FlowEngine.EWorkflowStepStatus.Handled && x.StepExpiredTime < SqlFunc.GetDate()))
 		    .WhereIF(IsCenter == false, x => x.HandlerOrgId == _sessionContext.RequiredOrgId)
 	        .GroupBy(x => new { x.ExternalId, x.HandlerOrgName })
-	        .Select(x => new { Id = x.ExternalId, WorkflowId = x.ExternalId, HandlerOrgName = x.HandlerOrgName })
-			.MergeTable();
+	        .Select(x => new { Id = x.ExternalId, WorkflowId = x.ExternalId, HandlerOrgName = x.HandlerOrgName });
+
         var queryCountersignOrder = _orderRepository.Queryable().InnerJoin(queryCountersign, (o, w) => o.Id == w.Id)
             .Select((o,w)=> new Order { DaysOverdueOrgName = w.HandlerOrgName, Id = o.Id.SelectAll() });
-		quer = _orderRepository.UnionAll(quer, queryCountersignOrder).Distinct();
+		quer = _orderRepository.UnionAll(quer, queryCountersignOrder);
 		return quer;
 	}