|
@@ -5461,15 +5461,15 @@ public class OrderController : BaseController
|
|
|
if (string.IsNullOrEmpty(order.WorkflowId))
|
|
|
throw UserFriendlyException.SameMessage("该工单未开启流程");
|
|
|
var dto = await _workflowApplication.GetNextStepsAsync(order.WorkflowId, HttpContext.RequestAborted);
|
|
|
+ var isShowWanggeyuan = false;
|
|
|
if (isSnapshotEnable)
|
|
|
{
|
|
|
var orderSnapShot = await _orderSnapshotRepository.GetAsync(orderId, HttpContext.RequestAborted);
|
|
|
- if (orderSnapShot != null && string.CompareOrdinal(orderSnapShot.IndustryName, "安全隐患") == 0)
|
|
|
- {
|
|
|
- dto.Steps = dto.Steps.Where(d => string.CompareOrdinal(d.Value, "网格员") != 0
|
|
|
- && string.CompareOrdinal(d.Value, "工单标记") != 0).ToList();
|
|
|
- }
|
|
|
+ isShowWanggeyuan = orderSnapShot != null && string.CompareOrdinal(orderSnapShot.IndustryName, "安全隐患") == 0;
|
|
|
}
|
|
|
+ if(!isShowWanggeyuan)
|
|
|
+ dto.Steps = dto.Steps.Where(d => string.CompareOrdinal(d.Value, "网格员") != 0
|
|
|
+ && string.CompareOrdinal(d.Value, "工单标记") != 0).ToList();
|
|
|
|
|
|
dto.ExpiredTime = order.ExpiredTime;
|
|
|
dto.Content = order.Content;
|