|
@@ -420,6 +420,9 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
|
|
|
if (!DynamicShouldTerminal(currentStep))
|
|
|
{
|
|
|
//动态生成下一步
|
|
|
+ var nextStepOption = CreateDynamicStep(currentStep.InstancePolicy);
|
|
|
+ dto.Steps = new List<NextStepOption> { nextStepOption };
|
|
|
+ return dto;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -427,6 +430,7 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
|
|
|
{
|
|
|
//按会签策略
|
|
|
//currentStep.CountersignPolicy
|
|
|
+
|
|
|
}
|
|
|
|
|
|
var nextDefines = workflow.WorkflowDefinition.FindStepDefines(currentStep.NextSteps.Select(d => d.Code));
|
|
@@ -438,10 +442,8 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
|
|
|
return dto;
|
|
|
}
|
|
|
|
|
|
- private bool DynamicShouldTerminal(WorkflowStep step)
|
|
|
- {
|
|
|
- step.Handlers.Any(d=>d.Key == step.TerminalDynamicMark)
|
|
|
- }
|
|
|
+ private bool DynamicShouldTerminal(WorkflowStep step) =>
|
|
|
+ step.NextStepCode == step.TerminalDynamicMark;
|
|
|
|
|
|
/// <summary>
|
|
|
/// 查询下一步所选节点对应待选项
|