|
@@ -1652,29 +1652,30 @@ public class OrderController : BaseController
|
|
|
var workflow = await _workflowDomainService.GetWorkflowAsync(workflowId, withDefine: true, withSteps: true,
|
|
|
cancellationToken: HttpContext.RequestAborted);
|
|
|
var currentStep = workflow.Steps.FirstOrDefault(d => d.Status == EWorkflowStepStatus.WaitForAccept || d.Status == EWorkflowStepStatus.WaitForHandle);
|
|
|
- if (!_sessionContext.OrgIsCenter && currentStep.Name != "中心初审")
|
|
|
- {
|
|
|
- if (result.Steps.Any(x => x.Value == "中心终审"))
|
|
|
- {
|
|
|
- result.Steps.Remove(result.Steps.First(x => x.Value == "中心终审"));
|
|
|
- }
|
|
|
- }
|
|
|
if (workflow != null)
|
|
|
{
|
|
|
- var orderDelay = await _orderDelayRepository.Queryable().Includes(x => x.Order).Where(x => x.Id == workflow.ExternalId)
|
|
|
+
|
|
|
+ var orderDelay = await _orderDelayRepository.Queryable().Includes(x => x.Order).Where(x => x.Id == workflow.ExternalId)
|
|
|
.FirstAsync(HttpContext.RequestAborted);
|
|
|
if (orderDelay != null)
|
|
|
{
|
|
|
- var result = await _workflowApplication.GetNextStepsAsync(workflowId, HttpContext.RequestAborted);
|
|
|
- if (!orderDelay.Order.IsProvince)
|
|
|
+ var result = await _workflowApplication.GetNextStepsAsync(workflowId, HttpContext.RequestAborted);
|
|
|
+ if (!orderDelay.Order.IsProvince)
|
|
|
{
|
|
|
if (result.Steps.Any(x => x.Value == "省审批"))
|
|
|
{
|
|
|
result.Steps.Remove(result.Steps.First(x => x.Value == "省审批"));
|
|
|
}
|
|
|
}
|
|
|
+ if (!_sessionContext.OrgIsCenter && currentStep.Name != "中心初审")
|
|
|
+ {
|
|
|
+ if (result.Steps.Any(x => x.Value == "中心终审"))
|
|
|
+ {
|
|
|
+ result.Steps.Remove(result.Steps.First(x => x.Value == "中心终审"));
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- return result;
|
|
|
+ return result;
|
|
|
}
|
|
|
}
|
|
|
|