|
@@ -397,7 +397,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
PrevStepCsHandled(workflow, csStartStep, ref updateSteps);
|
|
|
}
|
|
|
}
|
|
|
- else
|
|
|
+ else if (currentStep.CountersignPosition is ECountersignPosition.Inner)
|
|
|
{
|
|
|
PrevStepCsHandled(workflow, currentStep, ref updateSteps);
|
|
|
}
|
|
@@ -672,27 +672,6 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
csSteps.Add(startStep);
|
|
|
}
|
|
|
|
|
|
- /// <summary>
|
|
|
- /// 查找当前节点至结束节点间的所有节点(不含头尾)
|
|
|
- /// </summary>
|
|
|
- private void SearchCsSteps(WorkflowStep step, WorkflowStep csEndStep,
|
|
|
- List<WorkflowStep> steps, ref List<WorkflowStep> removeSteps)
|
|
|
- {
|
|
|
- if (step.Id == csEndStep.Id) return;
|
|
|
- var nextSteps = steps.Where(d => d.PrevStepId == step.Id).ToList();
|
|
|
- if (nextSteps.Any())
|
|
|
- {
|
|
|
- foreach (var nextStep in nextSteps)
|
|
|
- {
|
|
|
- SearchCsSteps(nextStep, csEndStep, steps, ref removeSteps);
|
|
|
- }
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- removeSteps.Add(step);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
/// <summary>
|
|
|
/// 撤回(返回到之前任意节点)
|
|
|
/// </summary>
|