|
@@ -2936,8 +2936,8 @@ public class OrderController : BaseController
|
|
|
.Includes(d => d.OrderPublish)
|
|
|
.Includes(d => d.OrderPushTypes)
|
|
|
//.Includes(d => d.OrderScreens)
|
|
|
- .Includes(d => d.OrderVisits, x => x.OrderVisitDetails)
|
|
|
- .Includes(d => d.OrderVisits, x => x.Employee)
|
|
|
+ .Includes(d => d.OrderVisits.Where(x => x.VisitState == EVisitState.Visited).ToList(), x => x.OrderVisitDetails)
|
|
|
+ .Includes(d => d.OrderVisits.Where(x => x.VisitState == EVisitState.Visited).ToList(), x => x.Employee)
|
|
|
.FirstAsync(d => d.Id == id);
|
|
|
if (order == null) return new();
|
|
|
|
|
@@ -2973,8 +2973,6 @@ public class OrderController : BaseController
|
|
|
{
|
|
|
canInsteadHandle = false;
|
|
|
}
|
|
|
-
|
|
|
- ;
|
|
|
}
|
|
|
|
|
|
if (canInsteadHandle)
|