|
|
@@ -2427,8 +2427,9 @@ public class OrderController : BaseController
|
|
|
[HttpGet("waited")]
|
|
|
public async Task<PagedDto<OrderDto>> QueryWaited([FromQuery] QueryOrderWaitedDto dto)
|
|
|
{
|
|
|
+ var isHandled = dto.IsHandled.HasValue && dto.IsHandled.Value;
|
|
|
var (total, items) = await _orderRepository
|
|
|
- .Queryable(viewFilter: true, handlerFilter: dto.IsHandled.HasValue && dto.IsHandled.Value)
|
|
|
+ .Queryable(viewFilter: true, handlerFilter: !isHandled)
|
|
|
.WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
|
d => d.No.Contains(dto.Keyword) || d.Title.Contains(dto.Keyword))
|
xf