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

src/Hotline.Application/Handlers/FlowEngine/WorkflowEndHandler.cs

@@ -199,7 +199,7 @@ public class WorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
                 //司法行政监督管理-工单处理
                 await _enforcementApplication.AddEnforcementOrderAsync(order, cancellationToken);
                 //推诿工单
-                await _enforcementApplication.AddPassTheBuckOrderAsync(order, _sessionContext.OrgId, _sessionContext.OrgName, cancellationToken);
+               // await _enforcementApplication.AddPassTheBuckOrderAsync(order, _sessionContext.OrgId, _sessionContext.OrgName, cancellationToken);
                 break;
             case WorkflowModuleConsts.OrderScreen:
                 var screen = await _orderScreenRepository.GetAsync(workflow.ExternalId, cancellationToken);

src/Hotline.Application/Handlers/FlowEngine/WorkflowNextHandler.cs

@@ -143,10 +143,12 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
 
                 //    expiredTimeChanged = true;
                 //}
-				await _orderRepository.UpdateAsync(order, cancellationToken);
+                await _orderRepository.UpdateAsync(order, cancellationToken);
 
                 //司法行政监督管理-推诿工单
-                await _enforcementApplication.AddPassTheBuckOrderAsync(order, _sessionContext.RequiredOrgId, _sessionContext.OrgName, cancellationToken);
+                if (notification.Trace.StepType != EStepType.Summary && notification.Trace.StepType != EStepType.End && !notification.Trace.IsCountersignEndStep)
+                    await _enforcementApplication.AddPassTheBuckOrderAsync(order, _sessionContext.RequiredOrgId, _sessionContext.OrgName, cancellationToken);
+
                 try
                 {
                     if (notification.Dto.IsSms)
@@ -213,7 +215,7 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
                     HandlerOrgLevel = notification.HandlerOrgId.CalcOrgLevel()
                 }, cancellationToken: cancellationToken);
 
-             
+
                 break;
             case WorkflowModuleConsts.KnowledgeAdd:
             case WorkflowModuleConsts.KnowledgeUpdate:

src/Hotline.Application/JudicialManagement/EnforcementApplication.cs

@@ -157,7 +157,7 @@ namespace Hotline.Application.JudicialManagement
                     if (orderData == null)
                     {
                         //没有工单数据，直接写入
-                        EnforcementOrders enforcementOrders = new EnforcementOrders()
+                        EnforcementOrders enforcementOrders = new()
                         {
                             Id = order.Id,
                             OrderNo = order.No,