|
@@ -333,7 +333,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
_ => throw new ArgumentOutOfRangeException()
|
|
|
};
|
|
|
|
|
|
- var counterSignType = GetCounterSignType(currentStep.BusinessType);
|
|
|
+ var counterSignType = GetCounterSignType(dto.IsStartCountersign);
|
|
|
|
|
|
var updateSteps = new List<WorkflowStep> { currentStep };
|
|
|
|
|
@@ -1376,21 +1376,27 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
return endTrace;
|
|
|
}
|
|
|
|
|
|
- /// <summary>
|
|
|
- /// 判断会签类型(中心会签或部门会签)
|
|
|
- /// </summary>
|
|
|
- /// <param name="businessType"></param>
|
|
|
- /// <returns></returns>
|
|
|
- /// <exception cref="ArgumentOutOfRangeException"></exception>
|
|
|
- public ECounterSignType? GetCounterSignType(EBusinessType businessType) =>
|
|
|
- businessType switch
|
|
|
- {
|
|
|
- EBusinessType.Center => ECounterSignType.Center,
|
|
|
- EBusinessType.Send => ECounterSignType.Center,
|
|
|
- EBusinessType.Department => ECounterSignType.Department,
|
|
|
- EBusinessType.File => null,
|
|
|
- _ => throw new ArgumentOutOfRangeException(nameof(businessType), businessType, null)
|
|
|
- };
|
|
|
+ ///// <summary>
|
|
|
+ ///// 判断会签类型(中心会签或部门会签)
|
|
|
+ ///// </summary>
|
|
|
+ ///// <param name="businessType"></param>
|
|
|
+ ///// <returns></returns>
|
|
|
+ ///// <exception cref="ArgumentOutOfRangeException"></exception>
|
|
|
+ //public ECounterSignType? GetCounterSignType(EBusinessType businessType) =>
|
|
|
+ // businessType switch
|
|
|
+ // {
|
|
|
+ // EBusinessType.Center => ECounterSignType.Center,
|
|
|
+ // EBusinessType.Send => ECounterSignType.Center,
|
|
|
+ // EBusinessType.Department => ECounterSignType.Department,
|
|
|
+ // EBusinessType.File => null,
|
|
|
+ // _ => throw new ArgumentOutOfRangeException(nameof(businessType), businessType, null)
|
|
|
+ // };
|
|
|
+
|
|
|
+ public ECounterSignType? GetCounterSignType(bool isStartCountersign)
|
|
|
+ {
|
|
|
+ if (!isStartCountersign) return null;
|
|
|
+ return _sessionContext.OrgIsCenter ? ECounterSignType.Center : ECounterSignType.Department;
|
|
|
+ }
|
|
|
|
|
|
/// <summary>
|
|
|
/// 办理节点
|