|
@@ -1942,20 +1942,23 @@ namespace Hotline.FlowEngine.Workflows
|
|
if (dto.IsStartCountersign) return;
|
|
if (dto.IsStartCountersign) return;
|
|
if (workflow.IsInCountersign) return;
|
|
if (workflow.IsInCountersign) return;
|
|
|
|
|
|
- if (workflow.FlowType is EFlowType.Handle && nextStepDefine.BusinessType is EBusinessType.Seat or EBusinessType.Send)
|
|
|
|
|
|
+ if (workflow.FlowType is EFlowType.Handle)
|
|
{
|
|
{
|
|
- //坐席->派单不选办理对象时
|
|
|
|
- workflow.UpdateCurrentStepWhenAssign(nextSteps.First(),
|
|
|
|
- new FlowStepHandler
|
|
|
|
- {
|
|
|
|
- OrgId = OrgSeedData.CenterId,
|
|
|
|
- OrgName = OrgSeedData.CenterName
|
|
|
|
- });
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- var nextHandler = dto.NextHandlers.First();
|
|
|
|
- workflow.UpdateCurrentStepWhenAssign(nextSteps.First(), nextHandler);
|
|
|
|
|
|
+ if (nextStepDefine.BusinessType is EBusinessType.Seat or EBusinessType.Send)
|
|
|
|
+ {
|
|
|
|
+ //坐席->派单不选办理对象时
|
|
|
|
+ workflow.UpdateCurrentStepWhenAssign(nextSteps.First(),
|
|
|
|
+ new FlowStepHandler
|
|
|
|
+ {
|
|
|
|
+ OrgId = OrgSeedData.CenterId,
|
|
|
|
+ OrgName = OrgSeedData.CenterName
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ var nextHandler = dto.NextHandlers.First();
|
|
|
|
+ workflow.UpdateCurrentStepWhenAssign(nextSteps.First(), nextHandler);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1966,20 +1969,23 @@ namespace Hotline.FlowEngine.Workflows
|
|
if (workflow.IsInCountersign) return;
|
|
if (workflow.IsInCountersign) return;
|
|
if (nextStepDefine.StepType is EStepType.Summary or EStepType.End) return;
|
|
if (nextStepDefine.StepType is EStepType.Summary or EStepType.End) return;
|
|
|
|
|
|
- if (workflow.FlowType is EFlowType.Handle && nextStepDefine.BusinessType is EBusinessType.Seat or EBusinessType.Send)
|
|
|
|
|
|
+ if (workflow.FlowType is EFlowType.Handle)
|
|
{
|
|
{
|
|
- //坐席->派单不选办理对象时
|
|
|
|
- workflow.UpdateActualStepWhenAssign(nextSteps.First(),
|
|
|
|
- new FlowStepHandler
|
|
|
|
- {
|
|
|
|
- OrgId = OrgSeedData.CenterId,
|
|
|
|
- OrgName = OrgSeedData.CenterName
|
|
|
|
- });
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- var nextHandler = dto.NextHandlers.First();
|
|
|
|
- workflow.UpdateActualStepWhenAssign(nextSteps.First(), nextHandler);
|
|
|
|
|
|
+ if (nextStepDefine.BusinessType is EBusinessType.Seat or EBusinessType.Send)
|
|
|
|
+ {
|
|
|
|
+ //坐席->派单不选办理对象时
|
|
|
|
+ workflow.UpdateActualStepWhenAssign(nextSteps.First(),
|
|
|
|
+ new FlowStepHandler
|
|
|
|
+ {
|
|
|
|
+ OrgId = OrgSeedData.CenterId,
|
|
|
|
+ OrgName = OrgSeedData.CenterName
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ var nextHandler = dto.NextHandlers.First();
|
|
|
|
+ workflow.UpdateActualStepWhenAssign(nextSteps.First(), nextHandler);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
//if ( /*workflow.FlowType is EFlowType.Handle &&*/
|
|
//if ( /*workflow.FlowType is EFlowType.Handle &&*/
|
|
@@ -2920,7 +2926,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
$"TerminalDynamicMark parse to int failed, tMark: {currentStepDefine.TerminalDynamicMark}");
|
|
$"TerminalDynamicMark parse to int failed, tMark: {currentStepDefine.TerminalDynamicMark}");
|
|
var leadRoleCode = _systemSettingCacheManager.GetSetting(SettingConstants.RoleLingDao)?.SettingValue[0];
|
|
var leadRoleCode = _systemSettingCacheManager.GetSetting(SettingConstants.RoleLingDao)?.SettingValue[0];
|
|
var isLead = _sessionContextProvider.SessionContext.Roles.Any(x => x == leadRoleCode);
|
|
var isLead = _sessionContextProvider.SessionContext.Roles.Any(x => x == leadRoleCode);
|
|
- return (currentOrgLevel <= tMark2) && (isLead || _sessionContextProvider.SessionContext.OrgIsCenter);
|
|
|
|
|
|
+ return (currentOrgLevel <= tMark2) && (isLead || _sessionContextProvider.SessionContext.OrgIsCenter);
|
|
case EDynamicPolicy.OrgDownCenterTop:
|
|
case EDynamicPolicy.OrgDownCenterTop:
|
|
case EDynamicPolicy.OrgDown:
|
|
case EDynamicPolicy.OrgDown:
|
|
if (!int.TryParse(currentStepDefine.TerminalDynamicMark, out var tMark1))
|
|
if (!int.TryParse(currentStepDefine.TerminalDynamicMark, out var tMark1))
|