From 9c4ea7ef89ce1216f4ad464a346ea3b313a2efaa Mon Sep 17 00:00:00 2001
From: CLKCLK <617682513@qq.com>
Date: Tue, 14 Sep 2021 11:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20sqlserver=20row=5Fnumber?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sqlserver 使用row_number进行分页时 第一页和后续几页排序不一致的问题
---
 .../SqlServer/Curd/OdbcSqlServerSelect.cs           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs
index 342d74ed..8d0870b0 100644
--- a/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs
+++ b/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs
@@ -41,14 +41,15 @@ namespace FreeSql.Odbc.SqlServer
                 //if (_limit > 0) sb.Append("TOP ").Append(_skip + _limit).Append(" "); //TOP 会引发 __rownum__ 无序的问题
                 if (_skip <= 0 && _limit > 0) sb.Append("TOP ").Append(_limit).Append(" ");
                 sb.Append(field);
+
+                if (string.IsNullOrEmpty(_orderby))
+                {
+                    var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();
+                    if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));
+                    else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
+                }
                 if (_skip > 0)
                 {
-                    if (string.IsNullOrEmpty(_orderby))
-                    {
-                        var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();
-                        if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));
-                        else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
-                    }
                     sb.Append(", ROW_NUMBER() OVER(").Append(_orderby).Append(") AS __rownum__");
                 }
                 sb.Append(" \r\nFROM ");