|
@@ -4047,13 +4047,12 @@ public class OrderController : BaseController
|
|
var specialSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.SpecialSendOrder).SettingValue[0]);
|
|
var specialSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.SpecialSendOrder).SettingValue[0]);
|
|
|
|
|
|
var baseTypeId = string.Empty;
|
|
var baseTypeId = string.Empty;
|
|
- if (step != null && step.Steps.Any() && _sessionContext.Roles.Contains("zuoxi") && specialSeats)
|
|
|
|
|
|
+ if (step != null && step.Steps.Any() && _sessionContext.Roles.Contains("zuoxi") && specialSeats && !_sessionContext.Roles.Contains("paidanyuan"))
|
|
{
|
|
{
|
|
step.Steps = step.Steps.Where(x => x.Key.ToLower() == "start").ToList();
|
|
step.Steps = step.Steps.Where(x => x.Key.ToLower() == "start").ToList();
|
|
if (step.Steps.Any()) baseTypeId = step.Steps[0].Key;
|
|
if (step.Steps.Any()) baseTypeId = step.Steps[0].Key;
|
|
}
|
|
}
|
|
-
|
|
|
|
- if (step != null && step.Steps.Any() && _sessionContext.Roles.Contains("paidanyuan") && specialSendOrder)
|
|
|
|
|
|
+ if (step != null && step.Steps.Any() && _sessionContext.Roles.Contains("paidanyuan") && specialSendOrder && !_sessionContext.Roles.Contains("zuoxi"))
|
|
{
|
|
{
|
|
step.Steps = step.Steps.Where(d => d.BusinessType is EBusinessType.Send).ToList();
|
|
step.Steps = step.Steps.Where(d => d.BusinessType is EBusinessType.Send).ToList();
|
|
if (step.Steps.Any()) baseTypeId = step.Steps[0].Key;
|
|
if (step.Steps.Any()) baseTypeId = step.Steps[0].Key;
|