Browse Source

Merge branch 'release' of http://110.188.24.182:10023/Fengwo/hotline into release

田爽 7 months ago
parent
commit
9d0b39521f
1 changed files with 4 additions and 1 deletions
  1. 4 1
      src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

+ 4 - 1
src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -111,7 +111,7 @@ namespace Hotline.FlowEngine.Workflows
 
                 //firstStep是否为end,t: 实际办理节点为startStep, 并且handlerId赋值 f: 实际办理节点为firstStep, handlerId未赋值
                 workflow.UpdateActualStepWhenHandle(startStep, current.OrgAreaCode, current.OrgAreaName, current.OrgLevel);
-
+                
                 workflow.UpdateCurrentStepWhenHandle(startStep, current.OrgAreaCode, current.OrgAreaName, current.OrgLevel);
 
                 var endTrace = await EndAsync(workflow, dto, firstStepDefine, startStep, current, expiredTime, cancellationToken);
@@ -1504,6 +1504,9 @@ namespace Hotline.FlowEngine.Workflows
             workflow.UpdateActualStepWhenHandle(endStep, current.OrgAreaCode, current.OrgAreaName, current.OrgLevel);
             workflow.UpdateActualStepAcceptTime(endStep.AcceptTime.Value);
 
+            if(string.IsNullOrEmpty(workflow.OrgLevelOneCode))
+                workflow.UpdateLevelOneOrg(workflow.ActualHandleOrgCode, workflow.ActualHandleOrgName);
+
             await _workflowRepository.UpdateAsync(workflow, cancellationToken);
 
             await _publisher.PublishAsync(new EndWorkflowNotify(workflow, endTrace, dto),