Commit 7ba61ec3 authored by thienvo's avatar thienvo

fixed

parent 762e2288
...@@ -589,7 +589,7 @@ namespace Sieve.Services ...@@ -589,7 +589,7 @@ namespace Sieve.Services
skip = (page - 1) * pageSize; skip = (page - 1) * pageSize;
take = Math.Min(pageSize, maxPageSize); take = Math.Min(pageSize, maxPageSize);
} }
public bool applyPageSize = true;
private IQueryable<TEntity> ApplyPagination<TEntity>( private IQueryable<TEntity> ApplyPagination<TEntity>(
TSieveModel model, TSieveModel model,
IQueryable<TEntity> result) IQueryable<TEntity> result)
...@@ -603,11 +603,14 @@ namespace Sieve.Services ...@@ -603,11 +603,14 @@ namespace Sieve.Services
{ {
ResultCountBeForeApplyPagination = result.Count(); ResultCountBeForeApplyPagination = result.Count();
} }
if (pageSize > 0) if (pageSize > 0)
{ {
result = result.Skip((page - 1) * pageSize); if (applyPageSize)
result = result.Take(Math.Min(pageSize, maxPageSize)); {
result = result.Skip((page - 1) * pageSize);
result = result.Take(Math.Min(pageSize, maxPageSize));
}
} }
return result; return result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment