基础方法拓展

src/Hotline/FlowEngine/Workflows/WorkflowStep.cs

@@ -189,7 +189,8 @@ public class WorkflowStep : StepBasicEntity
             EFlowAssignType.Org => !string.IsNullOrEmpty(HandlerOrgId) && HandlerOrgId == orgId,
             EFlowAssignType.User => !string.IsNullOrEmpty(HandlerId) && HandlerId == userId,
             EFlowAssignType.Role => !string.IsNullOrEmpty(RoleId) && roleIds.Contains(RoleId),
-            _ => throw new ArgumentOutOfRangeException()
+            EFlowAssignType.OrgAndRole => !string.IsNullOrEmpty(HandlerOrgId) && HandlerOrgId == orgId && !string.IsNullOrEmpty(RoleId) && roleIds.Contains(RoleId),
+			_ => throw new ArgumentOutOfRangeException()
         };
     }
     #endregion