Merge branch 'master' into dev

src/Hotline.Application/Mappers/WorkflowMapperConfigs.cs

@@ -41,10 +41,11 @@ public class WorkflowMapperConfigs : IRegister
             ;
 
         config.ForType<WorkflowStep, WorkflowTrace>()
-            .Ignore(d => d.Id)
             .Ignore(d => d.ParentId)
             .Ignore(d => d.Status)
-            .Map(d => d.StepId, s => s.Id);
+            .Map(d => d.StepId, s => s.Id)
+            .AfterMapping((s, d) => d.Id = s.Id)
+            ;
 
         config.ForType<WorkflowSupplement, WorkflowSupplementDto>()
             .Map(d => d.CreationTime, x => x.CreationTime)

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -560,8 +560,8 @@ namespace Hotline.FlowEngine.Workflows
             var trace = await PreviousTraceAsync(workflow.Id, dto, currentStep, cancellationToken);
 
             //复制上一个节点为待接办
-            var newPrevStep =
-                await DuplicateStepWithTraceAsync(workflow, prevStep, EWorkflowTraceStatus.Previous, cancellationToken);
+            var newPrevStep = await DuplicateStepWithTraceAsync(workflow, prevStep, EWorkflowTraceStatus.Previous, 
+                cancellationToken);
 
             //remove workflow.steps
             await _workflowStepRepository.RemoveRangeAsync(removeSteps, cancellationToken);
@@ -1591,7 +1591,7 @@ namespace Hotline.FlowEngine.Workflows
             newStep.StartCountersignId = step.StartCountersignId;
             newStep.CountersignId = step.CountersignId;
             newStep.IsStartedCountersignEnd = step.IsStartedCountersignEnd;
-            //await _workflowStepRepository.AddAsync(newStep, cancellationToken);
+            await _workflowStepRepository.AddAsync(newStep, cancellationToken);
 
             await CreateTraceAsync(workflow, newStep, traceStatus, cancellationToken);