|
|
@@ -382,10 +382,15 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
nextStepCanHandle = !unComplete;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if (nextStepCanHandle)
|
|
|
{
|
|
|
//将下一节点处理为已指派/可接办
|
|
|
await SetNextCountersignEndAssignedAsync(nextStepBox, currentStep, cancellationToken);
|
|
|
+
|
|
|
+ workflow.UpdateHandlers(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgCode,
|
|
|
+ flowAssignMode.FlowAssignType, flowAssignMode.HandlerObjects);
|
|
|
+
|
|
|
_mediator.Publish(new CountersignEndAssigned(workflow), cancellationToken);
|
|
|
}
|
|
|
|
|
|
@@ -393,9 +398,6 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
//更新workflow当前节点名称、时间、会签节点code 等字段
|
|
|
workflow.SetWorkflowCurrentStepInfo(isStartCountersign, nextStepBox);
|
|
|
|
|
|
- workflow.UpdateHandlers(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgCode,
|
|
|
- flowAssignMode.FlowAssignType, flowAssignMode.HandlerObjects);
|
|
|
-
|
|
|
await _workflowRepository.UpdateAsync(workflow, cancellationToken);
|
|
|
|
|
|
#endregion
|
|
|
@@ -715,8 +717,8 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
trace.ExpiredTime = workflow.ExpiredTime;
|
|
|
trace.TimeLimit = workflow.TimeLimit;
|
|
|
|
|
|
- //todo 1.如果是汇总节点，trace.parentId=会签开始节点对应的trace.parentId(即与会签开始节点trace同级)
|
|
|
- //todo 2.普通节点：2.1: in 判断上级节点是否发起会签，有则赋值parentId为上级trace.Id, 2.2: outer 与上级节点trace保持同级,取值上级节点对应trace.parentId
|
|
|
+ //1.如果是汇总节点，trace.parentId=会签开始节点对应的trace.parentId(即与会签开始节点trace同级)
|
|
|
+ //2.普通节点：2.1: in 判断上级节点是否发起会签，有则赋值parentId为上级trace.Id, 2.2: outer 与上级节点trace保持同级,取值上级节点对应trace.parentId
|
|
|
|
|
|
if (currentStep.StepType is EStepType.CountersignEnd)
|
|
|
{
|
xf