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

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -98,7 +98,7 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
         DateTime? expiredTime, CancellationToken cancellationToken = default)
     {
         var validator = new StartWorkflowDtoValidator();
-        var validResult = validator.Validate(dto);
+        var validResult = await validator.ValidateAsync(dto, cancellationToken);
         if (!validResult.IsValid)
             throw new UserFriendlyException(
                 $"非法参数, {string.Join(',', validResult.Errors.Select(d => d.ErrorMessage))}");

src/Hotline.Application/Mappers/WorkflowMapperConfigs.cs

@@ -84,5 +84,7 @@ public class WorkflowMapperConfigs : IRegister
             .IgnoreNonMapped(true)
             ;
 
+        config.ForType<BasicWorkflowDto, WorkflowStep>()
+            .Ignore(d => d.BusinessType);
     }
 }

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1388,7 +1388,7 @@ namespace Hotline.FlowEngine.Workflows
             //会签未全部办理则不创建汇总节点
             if (prevStep.StartedCountersignHasAllHandled())
             {
-                //todo 创建会签汇总节点
+                // 创建会签汇总节点
                 var countersignEndStep =
                     await CreateCountersignEndStepAsync(prevStep, dto, expiredTime, cancellationToken);
                 nextSteps = new List<WorkflowStep> { countersignEndStep };

src/Hotline/FlowEngine/Workflows/WorkflowStep.cs

@@ -38,7 +38,6 @@ public class WorkflowStep : StepBasicEntity
     /// </summary>
     public bool IsOrigin { get; set; }
 
-
     #region 会签
 
     /// <summary>