Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -163,6 +163,7 @@ namespace Hotline.Application.Subscribers
             model.State = 0;
             model.Province = true;
             model.ApplyContent = dto.ProvinceOrderSuperviseDto.SuperviseContent;
+            model.SuperviseSerial = dto.ProvinceOrderSuperviseDto.SuperviseSerial;
             if (dto.Files.Any())
                 model.FileJson =
                     await _fileRepository.AddFileAsync(dto.Files, model.Id, "", cancellationToken);

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1953,13 +1953,15 @@ namespace Hotline.FlowEngine.Workflows
         private void HandleStepsByTerminalCs(WorkflowStep step, List<WorkflowStep> steps, List<WorkflowTrace> traces,
             ref List<WorkflowStep> updateSteps, ref List<WorkflowTrace> updateTraces)
         {
-            if (step == null) return;
-            var nextSteps = steps.Where(d => d.PrevStepId == step.Id).ToList();
-            if (nextSteps.Any())
+            if (step.IsStartCountersign)
             {
-                foreach (var nextStep in nextSteps)
+                var countersignSteps = steps.Where(d => d.CountersignId == step.StartCountersignId).ToList();
+                if(countersignSteps.Any())
                 {
-                    HandleStepsByTerminalCs(nextStep, steps, traces, ref updateSteps, ref updateTraces);
+                    foreach (var countersignStep in countersignSteps)
+                    {
+                        HandleStepsByTerminalCs(countersignStep,steps,traces,ref updateSteps, ref updateTraces);
+                    }
                 }
             }
             EndStepByTerminalCs(step, traces, ref updateSteps, ref updateTraces);