|
@@ -4672,18 +4672,12 @@ public class OrderController : BaseController
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!));
|
|
|
|
|
|
//随手拍
|
|
|
- if (_systemSettingCacheManager.Snapshot && !string.IsNullOrEmpty(dto.IndustryId))
|
|
|
+ if (_systemSettingCacheManager.Snapshot)
|
|
|
{
|
|
|
- query.Where(d => d.OrderSnapshot.IndustryId == dto.IndustryId);
|
|
|
+ query = query.WhereIF(dto.IndustryId.NotNullOrEmpty(), d => d.OrderSnapshot.IndustryId == dto.IndustryId);
|
|
|
+ query = query.WhereIF(dto.IsSnapshot.HasValue && dto.IsSnapshot.Value == true, d => d.OrderSnapshot.Id != null);
|
|
|
}
|
|
|
|
|
|
- //var (total, items) = await _orderRepository.Queryable()
|
|
|
- // .WhereIF(!string.IsNullOrEmpty(dto.PhoneNo), d => d.Contact == dto.PhoneNo)
|
|
|
- // .WhereIF(!string.IsNullOrEmpty(dto.OrderId), d => d.Id != dto.OrderId)
|
|
|
- // .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
|
|
|
- // .OrderByDescending(d => d.CreationTime)
|
|
|
- // .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
-
|
|
|
var (total, items) = await query
|
|
|
.OrderByDescending(d => d.CreationTime)
|
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|