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

src/Hotline.Application/StatisticalReport/OrderReportApplication.cs

@@ -540,7 +540,7 @@ order by ""su"".""OrgCode""";
                          .WhereIF(dto.TypeId != null && dto.TypeId == 2, (d, o) => o.IdentityType == EIdentityType.Enterprise)
                         .WhereIF(dto.OrgCode == "001", (d, o) => d.ApplyOrgCode == dto.OrgCode)
                         .WhereIF(dto.OrgCode != "001" && dto.OrgCode != dto.ParentOrgCode, (d, o) => d.ApplyOrgCode.StartsWith(dto.OrgCode))
-                        .WhereIF(dto.OrgCode == "001" && dto.OrgCode == dto.ParentOrgCode, (d, o) => d.ApplyOrgCode == dto.OrgCode)
+                        .WhereIF(dto.OrgCode != "001" && dto.OrgCode == dto.ParentOrgCode, (d, o) => d.ApplyOrgCode == dto.OrgCode)
                         .OrderByDescending((d, o) => o.CreationTime)
                         .Select((d, o) => new SelectOrderId { Id = o.Id })
                        .MergeTable();

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -659,7 +659,7 @@ namespace Hotline.FlowEngine.Workflows
             await _workflowRepository.UpdateAsync(workflow, cancellationToken);
 
             await _publisher.PublishAsync(new PreviousNotify(workflow, newPrevStep, dto, isOrgToCenter),
-                PublishStrategy.ParallelNoWait, cancellationToken);
+                PublishStrategy.ParallelWhenAll, cancellationToken);
 
             return GetFlowDirection(currentStep.BusinessType, prevStep.BusinessType);
         }
@@ -1051,7 +1051,7 @@ namespace Hotline.FlowEngine.Workflows
             await _workflowRepository.UpdateAsync(workflow, cancellationToken);
 
             await _publisher.PublishAsync(new RecallNotify(workflow, targetStep, dto, isOrgToCenter),
-                PublishStrategy.ParallelNoWait, cancellationToken);
+                PublishStrategy.ParallelWhenAll, cancellationToken);
         }
 
         /// <summary>
@@ -1122,7 +1122,7 @@ namespace Hotline.FlowEngine.Workflows
             var dto = _mapper.Map<RecallDto>(targetStep);
             dto.WorkflowId = workflow.Id;
             await _publisher.PublishAsync(new RecallNotify(workflow, targetStep, dto, isOrgToCenter),
-                PublishStrategy.ParallelNoWait, cancellationToken);
+                PublishStrategy.ParallelWhenAll, cancellationToken);
         }
 
         ///// <summary>