|
@@ -4533,18 +4533,24 @@ public class OrderController : BaseController
|
|
model.StepCode = step.Code;
|
|
model.StepCode = step.Code;
|
|
model.Status = order.Status;
|
|
model.Status = order.Status;
|
|
|
|
|
|
- //if (!dto.Audit) model.State = 1;
|
|
|
|
- //取消根据进入界面判断是否审批 最新按照系统配置设定
|
|
|
|
var audit = true;
|
|
var audit = true;
|
|
- var setting = _systemSettingCacheManager.GetSetting(SettingConstants.SeatsMonitor);
|
|
|
|
- var settingStr = setting?.SettingValue;
|
|
|
|
- var roles = _sessionContext.Roles;
|
|
|
|
- foreach (var item in settingStr)
|
|
|
|
- {
|
|
|
|
- if (roles != null && roles.Contains(item)) audit = false;
|
|
|
|
|
|
+ var specialAduit = _systemSettingCacheManager.GetSetting(SettingConstants.SpecialAduit);
|
|
|
|
+ if (bool.Parse(specialAduit?.SettingValue[0]))
|
|
|
|
+ {
|
|
|
|
+ //if (!dto.Audit) model.State = 1;
|
|
|
|
+ //取消根据进入界面判断是否审批 最新按照系统配置设定
|
|
|
|
+ var setting = _systemSettingCacheManager.GetSetting(SettingConstants.SeatsMonitor);
|
|
|
|
+ var settingStr = setting?.SettingValue;
|
|
|
|
+ var roles = _sessionContext.Roles;
|
|
|
|
+ foreach (var item in settingStr)
|
|
|
|
+ {
|
|
|
|
+ if (roles != null && roles.Contains(item)) audit = false;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
-
|
|
|
|
- if (!audit) model.State = 1;
|
|
|
|
|
|
+ else {
|
|
|
|
+ audit = false;
|
|
|
|
+ }
|
|
|
|
+ if (!audit) model.State = 1;
|
|
|
|
|
|
model.InitId();
|
|
model.InitId();
|
|
if (dto.Files.Any())
|
|
if (dto.Files.Any())
|