This commit is contained in:
parent
229d5c1d3d
commit
7cd4ceb736
|
@ -30,18 +30,18 @@ namespace ShardingCore.Core.Internal.StreamMerge.ReWrite
|
||||||
|
|
||||||
//去除分页,获取前Take+Skip数量
|
//去除分页,获取前Take+Skip数量
|
||||||
var reWriteQueryable = _queryable;
|
var reWriteQueryable = _queryable;
|
||||||
if (skip.HasValue)
|
if (take.HasValue)
|
||||||
{
|
|
||||||
reWriteQueryable = _queryable.RemoveSkip();
|
|
||||||
}
|
|
||||||
if (take.HasValue&& skip.GetValueOrDefault()>0)
|
|
||||||
{
|
{
|
||||||
reWriteQueryable = _queryable.RemoveTake();
|
reWriteQueryable = _queryable.RemoveTake();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (skip.HasValue)
|
||||||
|
{
|
||||||
|
reWriteQueryable = _queryable.RemoveSkip();
|
||||||
|
}
|
||||||
|
|
||||||
//if (take.HasValue)
|
if (take.HasValue)
|
||||||
// reWriteQueryable = reWriteQueryable.Take(take.Value + skip.GetValueOrDefault());
|
reWriteQueryable = reWriteQueryable.Take(take.Value + skip.GetValueOrDefault());
|
||||||
//包含group by
|
//包含group by
|
||||||
if (extraEntry.GroupByContext.GroupExpression != null)
|
if (extraEntry.GroupByContext.GroupExpression != null)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue