|
|
@@ -2049,7 +2049,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
"未查询到会签开始节点，数据异常");
|
|
|
if (!startCountersignStep.IsCountersignEndStep)
|
|
|
return startCountersignStep;
|
|
|
- return GetCsLoopStartStep(steps, currentStep);
|
|
|
+ return GetCsLoopStartStep(steps, startCountersignStep);
|
|
|
}
|
|
|
|
|
|
#region private method
|
|
|
@@ -2324,8 +2324,9 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
BasicWorkflowDto dto, DateTime? expiredTime, bool isAutoFillSummaryOpinion = false, CancellationToken cancellationToken = default)
|
|
|
{
|
|
|
var countersignStartStep = workflow.Steps.FirstOrDefault(d => d.Id == step.PrevStepId);
|
|
|
+ //var countersignStartStep = workflow.Steps.FirstOrDefault(d => d.StartCountersignId == step.CountersignId);
|
|
|
if (countersignStartStep is null)
|
|
|
- throw new UserFriendlyException("未查询到当前节点上级节点");
|
|
|
+ throw new UserFriendlyException("未查询到当前节点上级会签开启节点");
|
|
|
var nextSteps = new List<WorkflowStep>();
|
|
|
//会签未全部办理则不创建汇总节点
|
|
|
|
|
|
@@ -2367,6 +2368,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
return nextSteps;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 以某一节点作为根节点开始查找最底层办理节点(需求：自动填充汇总节点意见)
|
|
|
/// </summary>
|
qinchaoyue