超期和即将超期

src/Hotline.Application/Orders/OrderApplication.cs

@@ -329,7 +329,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         var orgCode = _sessionContextProvider.SessionContext.OrgId;
         return _orderRepository.Queryable(canView: !IsCenter).Includes(d => d.OrderDelays)
 
-            .WhereIF(orgLevel == 2 || orgLevel ==3,d => SqlFunc.Subqueryable<WorkflowStep>()
+            .WhereIF(orgLevel ==3,d => SqlFunc.Subqueryable<WorkflowStep>()
                 .Where(step => step.ExternalId == d.Id && step.Status != EWorkflowStepStatus.Handled &&
                                ((step.FlowAssignType == EFlowAssignType.User && !string.IsNullOrEmpty(step.HandlerId) &&
                                  step.HandlerId == _sessionContextProvider.SessionContext.RequiredUserId) ||
@@ -338,7 +338,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                                 (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) &&
                                  _sessionContextProvider.SessionContext.Roles.Contains(step.RoleId))))
                 .Any())
-            .WhereIF(orgLevel == 1,d=> d.ActualHandleOrgCode.StartsWith(orgCode))
+            .WhereIF(orgLevel == 1 || orgLevel == 2, d=> d.ActualHandleOrgCode.StartsWith(orgCode))
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No.Contains(dto.No!))
             .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Title.Contains(dto.Title!))
@@ -389,7 +389,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         int orgLevel = _sessionContextProvider.SessionContext.OrgLevel;
         var orgCode = _sessionContextProvider.SessionContext.OrgId;
         return _orderRepository.Queryable(canView: false).Includes(d => d.OrderDelays)
-            .WhereIF(orgLevel == 3 || orgLevel == 2 , d => SqlFunc.Subqueryable<WorkflowStep>()
+            .WhereIF(orgLevel == 3 , d => SqlFunc.Subqueryable<WorkflowStep>()
                 .Where(step => step.ExternalId == d.Id && step.Status != EWorkflowStepStatus.Handled &&
                                ((step.FlowAssignType == EFlowAssignType.User && !string.IsNullOrEmpty(step.HandlerId) &&
                                  step.HandlerId == _sessionContextProvider.SessionContext.RequiredUserId) ||
@@ -398,7 +398,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                                 (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) &&
                                  _sessionContextProvider.SessionContext.Roles.Contains(step.RoleId))))
                 .Any())
-            .WhereIF(orgLevel == 1, d => d.ActualHandleOrgCode.StartsWith(orgCode))
+            .WhereIF(orgLevel == 1 || orgLevel == 2, d => d.ActualHandleOrgCode.StartsWith(orgCode))
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             //.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
             .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.No.Contains(dto.No))