|
@@ -128,7 +128,7 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
|
|
if (firstStepDefine.HandlerType is not EHandlerType.Role && !dto.NextHandlers.Any())
|
|
if (firstStepDefine.HandlerType is not EHandlerType.Role && !dto.NextHandlers.Any())
|
|
throw UserFriendlyException.SameMessage("未指派办理人");
|
|
throw UserFriendlyException.SameMessage("未指派办理人");
|
|
|
|
|
|
- if (dto.IsStartCountersign)
|
|
|
|
|
|
+ if (dto.HandleMode is not EHandleMode.Normal)
|
|
{
|
|
{
|
|
if (!startStepDefine.CanStartCountersign)
|
|
if (!startStepDefine.CanStartCountersign)
|
|
throw new UserFriendlyException("当前节点不支持发起会签");
|
|
throw new UserFriendlyException("当前节点不支持发起会签");
|
|
@@ -1195,9 +1195,9 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
|
|
{
|
|
{
|
|
var workflow = await _workflowDomainService.GetWorkflowAsync(workflowId, withSteps: true, withTraces: true,
|
|
var workflow = await _workflowDomainService.GetWorkflowAsync(workflowId, withSteps: true, withTraces: true,
|
|
cancellationToken: cancellationToken);
|
|
cancellationToken: cancellationToken);
|
|
- var step = workflow.Steps.FirstOrDefault(d =>
|
|
|
|
|
|
+ var step = workflow.Steps.FirstOrDefault(d =>
|
|
d.StepHandlers.Any(d => d.OrgId == "001171" || d.OrgId == "001178"));
|
|
d.StepHandlers.Any(d => d.OrgId == "001171" || d.OrgId == "001178"));
|
|
- if(step is not null)
|
|
|
|
|
|
+ if (step is not null)
|
|
{
|
|
{
|
|
step.FileJson = await _fileRepository.AddFileAsync(files, workflow.ExternalId, step.Id, cancellationToken);
|
|
step.FileJson = await _fileRepository.AddFileAsync(files, workflow.ExternalId, step.Id, cancellationToken);
|
|
var trace = workflow.Traces.First(d => d.StepId == step.Id);
|
|
var trace = workflow.Traces.First(d => d.StepId == step.Id);
|