Explorar el Código

feature: 工单待办已办调整过滤条件:已归档特提工单可被查看

xf hace 9 meses
padre
commit
550bd6600b

+ 3 - 1
src/Hotline.Repository.SqlSugar/Extensions/DataPermissionExtensions.cs

@@ -45,7 +45,9 @@ namespace Hotline.Repository.SqlSugar.Extensions
             return queryable.Where(d => SqlFunc.Subqueryable<WorkflowTrace>()
                 .Where(step => step.ExternalId == d.Id &&
                                (hasHandled || step.Status != EWorkflowStepStatus.Handled) &&
-                               (!hasHandled || step.Status == EWorkflowStepStatus.Handled && step.TraceState != EWorkflowTraceState.StepRemoveByPrevious) &&
+                               (!hasHandled || step.Status == EWorkflowStepStatus.Handled && 
+                                   step.TraceState != EWorkflowTraceState.StepRemoveByPrevious &&
+                                   step.TraceState != EWorkflowTraceState.StepRemoveByRecall) &&
                                ((step.FlowAssignType == EFlowAssignType.User && !string.IsNullOrEmpty(step.HandlerId) && step.HandlerId == session.RequiredUserId) ||
                                 (step.FlowAssignType == EFlowAssignType.Org && !string.IsNullOrEmpty(step.HandlerOrgId) && step.HandlerOrgId == session.RequiredOrgId) ||
                                 (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) && session.Roles.Contains(step.RoleId))))