|
@@ -504,8 +504,8 @@ public class OrderController : BaseController
|
|
|
{
|
|
|
var (total, items) = await _orderPublishRepository.Queryable()
|
|
|
.Includes(x => x.Order)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
|
- d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.StartsWith(dto.Keyword!))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.Order.No == dto.No!)
|
|
|
.WhereIF(dto.Resolve.HasValue, x => x.Resolve == dto.Resolve)
|
|
|
.OrderBy(d => d.CreationTime)
|
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|