|
@@ -1855,7 +1855,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
//};
|
|
|
|
|
|
//create endStep
|
|
|
- var endStep = await CreateEndStepAsync(workflow, endStepDefine, currentStep,dto, expiredTime,
|
|
|
+ var endStep = await CreateEndStepAsync(workflow, endStepDefine, currentStep, dto, expiredTime,
|
|
|
cancellationToken);
|
|
|
//workflow.Steps.Add(endStep);
|
|
|
|
|
@@ -1942,7 +1942,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
if (dto.IsStartCountersign) return;
|
|
|
if (workflow.IsInCountersign) return;
|
|
|
|
|
|
- if (nextStepDefine.BusinessType is EBusinessType.Seat or EBusinessType.Send)
|
|
|
+ if (workflow.FlowType is EFlowType.Handle && nextStepDefine.BusinessType is EBusinessType.Seat or EBusinessType.Send)
|
|
|
{
|
|
|
//坐席->派单不选办理对象时
|
|
|
workflow.UpdateCurrentStepWhenAssign(nextSteps.First(),
|
|
@@ -1966,7 +1966,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
if (workflow.IsInCountersign) return;
|
|
|
if (nextStepDefine.StepType is EStepType.Summary or EStepType.End) return;
|
|
|
|
|
|
- if (nextStepDefine.BusinessType is EBusinessType.Seat or EBusinessType.Send)
|
|
|
+ if (workflow.FlowType is EFlowType.Handle && nextStepDefine.BusinessType is EBusinessType.Seat or EBusinessType.Send)
|
|
|
{
|
|
|
//坐席->派单不选办理对象时
|
|
|
workflow.UpdateActualStepWhenAssign(nextSteps.First(),
|
|
@@ -2752,7 +2752,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
StepDefine endStepDefine,
|
|
|
WorkflowStep prevStep,
|
|
|
BasicWorkflowDto dto,
|
|
|
- DateTime? expiredTime,
|
|
|
+ DateTime? expiredTime,
|
|
|
CancellationToken cancellationToken)
|
|
|
{
|
|
|
if (workflow.Steps.Any(d => d.StepType == EStepType.End))
|
|
@@ -2770,7 +2770,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
|
|
|
var step = CreateStep(workflow, endStepDefine, prevStep, EFlowAssignType.User, handler,
|
|
|
null, null, EWorkflowStepStatus.WaitForAccept,
|
|
|
- ECountersignPosition.None, expiredTime, endStepDefine.Name, true, businessType: EBusinessType.File,flowDirection: dto.FlowDirection);
|
|
|
+ ECountersignPosition.None, expiredTime, endStepDefine.Name, true, businessType: EBusinessType.File, flowDirection: dto.FlowDirection);
|
|
|
|
|
|
//step.Accept(_sessionContextProvider.SessionContext.RequiredUserId, _sessionContextProvider.SessionContext.UserName,
|
|
|
// _sessionContextProvider.SessionContext.RequiredOrgId, _sessionContextProvider.SessionContext.OrgName,
|
|
@@ -2843,7 +2843,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
var isMain = handlers.Count == 1 || (handlers.Count > 1 && handler.Key == dto.NextMainHandler);
|
|
|
var step = CreateStep(workflow, stepDefine, prevStep, flowAssignType,
|
|
|
handler, dto.NextStepCode, countersignId, stepStatus, csPosition, expiredTime,
|
|
|
- dto.NextStepName, isOrigin, isMain, handlerType, dto.BusinessType,dto.FlowDirection);
|
|
|
+ dto.NextStepName, isOrigin, isMain, handlerType, dto.BusinessType, dto.FlowDirection);
|
|
|
|
|
|
//var stepHandler = stepHandlers.First(d => d.GetHandler().Key == handler.Key);
|
|
|
//step.StepHandlers = new List<WorkflowStepHandler> { stepHandler };
|