|
@@ -2418,7 +2418,6 @@ public class OrderController : BaseController
|
|
|
{
|
|
|
var (total, items) = await _orderSpecialRepository.Queryable()
|
|
|
.Includes(x => x.Order)
|
|
|
- .Includes(x => x.Step)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
|
x => x.Order.No.Contains(dto.Keyword!) || x.Order.Title.Contains(dto.Keyword!))
|
|
|
.WhereIF(dto.State.HasValue, x => x.State == dto.State)
|
|
@@ -2481,7 +2480,6 @@ public class OrderController : BaseController
|
|
|
{
|
|
|
var item = await _orderSpecialRepository.Queryable()
|
|
|
.Includes(x => x.Order)
|
|
|
- .Includes(x => x.Step)
|
|
|
.FirstAsync(x => x.Id == id);
|
|
|
return _mapper.Map<OrderSpecialDto>(item);
|
|
|
}
|