|
@@ -769,7 +769,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
public async Task<WorkflowStep> FindLastHandleStepAsync(string workflowId, string orgId, CancellationToken cancellation)
|
|
|
{
|
|
|
return await _workflowStepRepository.Queryable()
|
|
|
- .Where(d => d.StepHandlers.Any(d => d.OrgId == orgId))
|
|
|
+ .Where(d => d.StepHandlers.Any(sh => sh.OrgId == orgId) && d.WorkflowId == workflowId)
|
|
|
.OrderByDescending(d => d.HandleTime)
|
|
|
.FirstAsync(cancellation);
|
|
|
}
|