Merge branch 'test' of http://git.12345lm.cn/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -3240,7 +3240,8 @@ public class OrderController : BaseController
     /// </summary>
     [HttpPost("add-anonymous")]
     [AllowAnonymous]
-    public async Task<AddOrderResponse> AddAnonymous([FromBody] AddOrderDto dto)
+    [LogFilter("省平台调用记录")]
+	public async Task<AddOrderResponse> AddAnonymous([FromBody] AddOrderDto dto)
     {
         return await _orderApplication.ReceiveOrderFromExternalAsync(dto, HttpContext.RequestAborted);
     }

src/Hotline.Application/Orders/OrderApplication.cs

@@ -2711,15 +2711,13 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 var isPaiDan = await _workflowDomainService.RecallToCenterFirstToSendAsync(order.WorkflowId, "省工单重派", order.Status >= EOrderStatus.Filed,
                     order.ExpiredTime, cancellationToken);
                 order.FileEmpty();
-                if (isPaiDan)
+
+                var status = EOrderStatus.WaitForAccept;
+				if (isPaiDan)
                 {
                     order.Status = EOrderStatus.Handling;
                 }
-                else
-                {
-                    order.Status = EOrderStatus.WaitForAccept;
-                }
-                await _orderRepository.Updateable().SetColumns(o => new Order{ Status = order.Status }).Where(o => o.Id == order.Id).ExecuteCommandAsync(cancellationToken);
+                await _orderRepository.Updateable().SetColumns(o => new Order{ Status = status }).Where(o => o.Id == order.Id).ExecuteCommandAsync(cancellationToken);
 				//await _orderRepository.UpdateAsync(order, cancellationToken);
 				//处理回访和发布信息
 

src/Hotline/FlowEngine/Workflows/Workflow.cs

@@ -641,7 +641,7 @@ public partial class Workflow
     public void EndCountersign()
     {
         IsInCountersign = false;
-        TopCountersignStepId = null;
+        //TopCountersignStepId = null;
     }
 
     /// <summary>

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -276,7 +276,9 @@ namespace Hotline.FlowEngine.Workflows
 
             StepDefine nextStepDefine;
             if (isNextDynamic
-                || (currentStep.IsInCountersign() && !currentStep.IsTopCountersignEndStep(workflow.TopCountersignStepId))
+                || (workflow.IsInCountersign
+                    && currentStep.IsInCountersign() 
+                    && !currentStep.IsTopCountersignEndStep(workflow.TopCountersignStepId))
                 || dto.IsStartCountersign)
             {
                 //下一步配置为当前节点配置