From 6085fb7e42f8e66570c123b7f8330d38b929379d Mon Sep 17 00:00:00 2001
From: CLKCLK <617682513@qq.com>
Date: Tue, 14 Sep 2021 12:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=20row=5Fnumber=E6=8E=92?=
 =?UTF-8?q?=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

修改遗漏的SqlServerSelect
---
 .../FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs b/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs
index 25698185..bd1592b3 100644
--- a/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs
+++ b/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs
@@ -41,7 +41,8 @@ namespace FreeSql.SqlServer.Curd
                 //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 (_skip > 0)
+
+                if (_limit > 0)
                 {
                     if (string.IsNullOrEmpty(_orderby))
                     {
@@ -49,7 +50,8 @@ namespace FreeSql.SqlServer.Curd
                         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__");
+                    if (_skip > 0) // 注意这个判断，大于 0 才使用 ROW_NUMBER ，否则属于第一页直接使用 TOP
+                        sb.Append(", ROW_NUMBER() OVER(").Append(_orderby).Append(") AS __rownum__");
                 }
                 sb.Append(" \r\nFROM ");
                 var tbsjoin = _tables.Where(a => a.Type != SelectTableInfoType.From).ToArray();