|
@@ -2109,7 +2109,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
|
|
|
query = query
|
|
query = query
|
|
.Includes(x => x.OrderSupervises.OrderByDescending(d => d.CreationTime).Take(2).ToList())
|
|
.Includes(x => x.OrderSupervises.OrderByDescending(d => d.CreationTime).Take(2).ToList())
|
|
- .Includes(x => x.OrderVisits, d => d.OrderVisitDetails.Where(c => c.VisitTarget == EVisitTarget.Org).Take(1).ToList());
|
|
|
|
|
|
+ .Includes(x => x.OrderVisits.Where(q=>q.VisitState == EVisitState.Visited).Take(1).ToList(), d => d.OrderVisitDetails.Where(c => c.VisitTarget == EVisitTarget.Org).Take(1).ToList());
|
|
|
|
|
|
return query;
|
|
return query;
|
|
}
|
|
}
|