diff --git a/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs b/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs index ab56c0a3a..406eedb77 100644 --- a/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs +++ b/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs @@ -132,7 +132,7 @@ namespace OrmTest.Demo int count = 0; var list4 = db.Queryable() - .PartitionBy(it => new { it.Name }).Take(1).ToPageList(3,3,ref count); + .PartitionBy(it => new { it.Name }).Take(1).OrderBy(it=>it.Id).ToPageList(3,3,ref count); //SqlFunc.AggregateSum(object thisValue) //SqlFunc.AggregateAvg(TResult thisValue) diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index d3e933bb9..86e3a485e 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -224,6 +224,7 @@ namespace SqlSugar public virtual string ToSqlString() { string oldOrderBy = this.OrderByValue; + string externalOrderBy = oldOrderBy; if (!IsDisabledGobalFilter && this.Context.QueryFilter.GeFilterList.IsValuable()) { var gobalFilterList = this.Context.QueryFilter.GeFilterList.Where(it => it.FilterName.IsNullOrEmpty()).ToList(); @@ -252,7 +253,10 @@ namespace SqlSugar var result = ToPageSql(sql.ToString(), this.Take, this.Skip); if (ExternalPageIndex > 0) { - result = string.Format("SELECT *,ROW_NUMBER() OVER(ORDER BY GETDATE()) AS RowIndex2 FROM ({0}) ExternalTable ", result); + if (externalOrderBy.IsNullOrEmpty()) { + externalOrderBy = " ORDER BY GetDate() "; + } + result = string.Format("SELECT *,ROW_NUMBER() OVER({0}) AS RowIndex2 FROM ({1}) ExternalTable ", externalOrderBy,result); result = ToPageSql2(result,ExternalPageIndex, ExternalPageSize, true); } this.OrderByValue = oldOrderBy; diff --git a/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs b/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs index f4511feeb..74cf27b08 100644 --- a/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs +++ b/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.2.0.4")] -[assembly: AssemblyFileVersion("4.2.0.4")] +[assembly: AssemblyVersion("4.2.0.6")] +[assembly: AssemblyFileVersion("4.2.0.6")]