|
@@ -697,8 +697,8 @@ public class OrderController : BaseController
|
|
|
.Includes(d => d.Employee)
|
|
|
.Includes(d => d.OrderVisitDetails)
|
|
|
.WhereIF(dto.VisitState == EVisitStateQuery.NoVisit,
|
|
|
- x => x.VisitState == EVisitState.WaitForVisit ||
|
|
|
- x.VisitState == EVisitState.NoSatisfiedWaitForVisit)
|
|
|
+ d => d.VisitState == EVisitState.WaitForVisit ||
|
|
|
+ d.VisitState == EVisitState.NoSatisfiedWaitForVisit)
|
|
|
.WhereIF(dto.VisitState == EVisitStateQuery.Visited, d => d.VisitState == EVisitState.Visited)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.StartsWith(dto.Keyword!))
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No == dto.No)
|