Browse Source

fixed: GetToExpireAsync

xf 5 months ago
parent
commit
55c2a5bc84
1 changed files with 6 additions and 1 deletions
  1. 6 1
      src/Hotline.Application/Orders/OrderApplication.cs

+ 6 - 1
src/Hotline.Application/Orders/OrderApplication.cs

@@ -424,7 +424,12 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                                 (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) &&
                                 (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) &&
                                  _sessionContextProvider.SessionContext.Roles.Contains(step.RoleId))))
                                  _sessionContextProvider.SessionContext.Roles.Contains(step.RoleId))))
                 .Any())
                 .Any())
-            .WhereIF(orgLevel == 2 || orgLevel == 1, d => d.ActualHandleOrgCode.StartsWith(orgCode))
+            // .WhereIF(orgLevel == 2 || orgLevel == 1, d =>  d.ActualHandleOrgCode.StartsWith(orgCode))
+            .WhereIF(orgLevel == 2 || orgLevel == 1,  d => SqlFunc.Subqueryable<WorkflowStep>()
+                .Where(step => step.ExternalId == d.Id && 
+                               step.Status != EWorkflowStepStatus.Handled &&
+                               step.HandlerOrgId.StartsWith(orgCode))
+                .Any())
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .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.Keyword), d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
             .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.No.Contains(dto.No))
             .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.No.Contains(dto.No))