|
@@ -153,7 +153,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
UpdateActualStep(workflow, dto, firstStepDefine, firstSteps);
|
|
|
|
|
|
//更新实际办理节点
|
|
|
- UpdateCurrentStep(workflow, dto, firstSteps);
|
|
|
+ UpdateCurrentStep(workflow, dto, firstStepDefine, firstSteps);
|
|
|
|
|
|
//发起会签时记录顶层会签节点(必须在update currentStep之后)
|
|
|
if (dto.IsStartCountersign && !workflow.IsInCountersign)
|
|
@@ -1483,17 +1483,25 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
|
|
|
#region private method
|
|
|
|
|
|
- private static void UpdateCurrentStep(Workflow workflow, BasicWorkflowDto dto, List<WorkflowStep> nextSteps)
|
|
|
+ private static void UpdateCurrentStep(Workflow workflow, BasicWorkflowDto dto,
|
|
|
+ StepDefine nextStepDefine, List<WorkflowStep> nextSteps)
|
|
|
{
|
|
|
if (dto.IsStartCountersign) return;
|
|
|
if (workflow.IsInCountersign) return;
|
|
|
|
|
|
- var nextHandler = dto.NextHandlers.First();
|
|
|
- workflow.UpdateCurrentStepWhenAssign(nextSteps.First(), nextHandler);
|
|
|
+ if (nextStepDefine.BusinessType is EBusinessType.Center or EBusinessType.Send)
|
|
|
+ {
|
|
|
+
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ var nextHandler = dto.NextHandlers.First();
|
|
|
+ workflow.UpdateCurrentStepWhenAssign(nextSteps.First(), nextHandler);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- private static void UpdateActualStep(Workflow workflow, BasicWorkflowDto dto, StepDefine nextStepDefine,
|
|
|
- List<WorkflowStep> nextSteps)
|
|
|
+ private static void UpdateActualStep(Workflow workflow, BasicWorkflowDto dto,
|
|
|
+ StepDefine nextStepDefine, List<WorkflowStep> nextSteps)
|
|
|
{
|
|
|
if (dto.IsStartCountersign) return;
|
|
|
if (workflow.IsInCountersign) return;
|
|
@@ -1503,7 +1511,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
{
|
|
|
workflow.UpdateActualStepWhenAssign(nextSteps.First(),
|
|
|
actualHandleOrgCode: OrgSeedData.CenterId,
|
|
|
- actualHandleOrgName: "市民热线服务中心");
|
|
|
+ actualHandleOrgName: OrgSeedData.CenterName);
|
|
|
}
|
|
|
else
|
|
|
{
|