|
@@ -933,18 +933,21 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
? EStepCountersignStatus.InCountersign
|
|
|
: EStepCountersignStatus.None
|
|
|
: prevStep.GetNextStepCountersignStatus();
|
|
|
+
|
|
|
+ var countersignId = isPrevStartCountersign ? prevStep.StartCountersignId : prevStep.CountersignId;
|
|
|
+
|
|
|
List<WorkflowStep> subSteps;
|
|
|
if (stepBoxDefine.HandlerType is EHandlerType.AssignUser or EHandlerType.AssignOrg)
|
|
|
{
|
|
|
subSteps = CreateSubSteps(isPrevStartCountersign, stepBox, stepBox.HandlerClassifies, dto.NextStepCode, dto.NextMainHandler,
|
|
|
- prevStep?.Id, prevStep?.StartCountersignId, stepStatus, countersignStatus);
|
|
|
+ prevStep?.Id, countersignId, stepStatus, countersignStatus);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
if (stepBoxDefine.HandlerType != EHandlerType.Role && !dto.NextHandlers.Any())
|
|
|
throw new UserFriendlyException("未指定节点处理者");
|
|
|
subSteps = CreateSubSteps(isPrevStartCountersign, stepBox, dto.NextHandlers, dto.NextStepCode, dto.NextMainHandler,
|
|
|
- prevStep?.Id, prevStep?.StartCountersignId, stepStatus, countersignStatus);
|
|
|
+ prevStep?.Id, countersignId, stepStatus, countersignStatus);
|
|
|
}
|
|
|
stepBox.Steps.AddRange(subSteps);
|
|
|
await _workflowStepRepository.AddRangeAsync(subSteps, cancellationToken);
|