|
@@ -2334,7 +2334,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
|
|
|
private WorkflowStep? GetLastCountersignEndStep(List<WorkflowStep> steps, WorkflowStep nextStep)
|
|
private WorkflowStep? GetLastCountersignEndStep(List<WorkflowStep> steps, WorkflowStep nextStep)
|
|
{
|
|
{
|
|
- var csEndStep = steps.FirstOrDefault(d => d.CountersignStartStepId == nextStep.Id);
|
|
|
|
|
|
+ var csEndStep = steps.FirstOrDefault(d => d.IsCountersignEndStep && d.CountersignStartStepId == nextStep.Id);
|
|
if (csEndStep == null) return null;
|
|
if (csEndStep == null) return null;
|
|
return !csEndStep.IsStartCountersign ? csEndStep : GetLastCountersignEndStep(steps, csEndStep);
|
|
return !csEndStep.IsStartCountersign ? csEndStep : GetLastCountersignEndStep(steps, csEndStep);
|
|
}
|
|
}
|
|
@@ -2366,7 +2366,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
|
|
|
csEndStep.Reset();
|
|
csEndStep.Reset();
|
|
csEndStep.ResetParameters();
|
|
csEndStep.ResetParameters();
|
|
-
|
|
|
|
|
|
+
|
|
if (!string.IsNullOrEmpty(opinion))
|
|
if (!string.IsNullOrEmpty(opinion))
|
|
csEndStep.Opinion = opinion;
|
|
csEndStep.Opinion = opinion;
|
|
|
|
|