|
@@ -256,6 +256,12 @@ namespace Hotline.Api.Controllers.Bi
|
|
query = dto.SortRule == 0 ? query.OrderBy(x => x.Subtotal) : query.OrderByDescending(x => x.Subtotal);
|
|
query = dto.SortRule == 0 ? query.OrderBy(x => x.Subtotal) : query.OrderByDescending(x => x.Subtotal);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (string.IsNullOrEmpty(dto.SortField))
|
|
|
|
+ {
|
|
|
|
+ query = query.OrderByDescending(x => x.Subtotal);
|
|
|
|
+ }
|
|
|
|
+
|
|
var (total, items) = await query.Where(x => (x.CentreArchive + x.CentreCareOf + x.Invalid + x.Repeat) != 0).ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
var (total, items) = await query.Where(x => (x.CentreArchive + x.CentreCareOf + x.Invalid + x.Repeat) != 0).ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
return new PagedDto<OrderBiCentreDataListVo>(total, items);
|
|
return new PagedDto<OrderBiCentreDataListVo>(total, items);
|
|
}
|
|
}
|