Update .net core project

Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs

@@ -340,9 +340,17 @@ namespace SqlSugar
                                  }).ToList();
                 foreach (var item in groupQuery)
                 {
-                  
+
-                   // var setValue = navList.FirstOrDefault(x => navPkColumn.PropertyInfo.GetValue(x).ObjToString() == navColumn.PropertyInfo.GetValue(item).ObjToString());
+                    // var setValue = navList.FirstOrDefault(x => navPkColumn.PropertyInfo.GetValue(x).ObjToString() == navColumn.PropertyInfo.GetValue(item).ObjToString());
-                    navObjectNamePropety.SetValue(item.l, item.n);
+
+                    if (navObjectNamePropety.GetValue(item.l) == null)
+                    {
+                        navObjectNamePropety.SetValue(item.l, item.n);
+                    }
+                    else
+                    {
+                        //The reserved
+                    }
 
                 }
             }

Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/DbMethods/DefaultDbMethod.cs

@@ -8,6 +8,21 @@ namespace SqlSugar
 {
     public partial class DefaultDbMethod : IDbMethods
     {
+        public virtual string RowNumber(MethodCallExpressionModel model) 
+        {
+            if (model.Args.Count == 1)
+            {
+                return $"row_number() over(order by {model.Args[0].MemberName})";
+            }
+            else
+            {
+                return $"row_number() over( partition by {model.Args[1].MemberName} order by {model.Args[0].MemberName})";
+            }
+        }
+        public virtual string RowCount(MethodCallExpressionModel model) 
+        {
+            return "count(1) over()";
+        }
         public virtual string IIF(MethodCallExpressionModel model)
         {
             var parameter = model.Args[0];

Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/DbMethods/IDbMethods.cs

@@ -87,6 +87,9 @@ namespace SqlSugar
         string Asc(MethodCallExpressionModel model);
         string Desc(MethodCallExpressionModel model);
         string Stuff(MethodCallExpressionModel model);
+        string RowNumber(MethodCallExpressionModel model);
+        string RowCount(MethodCallExpressionModel model);
+
         string GetDateString(string dateValue,string format);
         string GetForXmlPath();
     }

Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/DbMethods/SqlFunc.cs

@@ -9,6 +9,18 @@ namespace SqlSugar
 {
     public partial class SqlFunc
     {
+        public static int RowNumber(object orderByField, object partitionBy) 
+        {
+            throw new NotSupportedException("Can only be used in expressions");
+        }
+        public static int RowNumber(object orderByField)
+        {
+            throw new NotSupportedException("Can only be used in expressions");
+        }
+        public static int RowCount()
+        {
+            throw new NotSupportedException("Can only be used in expressions");
+        }
         public static T Desc<T>(T value)
         {
             throw new NotSupportedException("Can only be used in expressions");

Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs

@@ -1010,6 +1010,10 @@ namespace SqlSugar
                         return this.Context.DbMehtods.Desc(model);
                     case "Stuff":
                         return this.Context.DbMehtods.Stuff(model);
+                    case "RowNumber":
+                        return this.Context.DbMehtods.RowNumber(model);
+                    case "RowCount":
+                        return this.Context.DbMehtods.RowCount(model);
                     default:
                         break;
                 }

Src/Asp.NetCore2/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs

@@ -53,6 +53,10 @@ namespace SqlSugar
             }
             else if (Skip != null && Take != null)
             {
+                if (Skip == 0 && Take == 1 && this.OrderByValue == "ORDER BY NOW() ")
+                {
+                    this.OrderByValue = null;
+                }
                 if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0];
                 result = string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, Skip.ObjToInt() > 0 ? Skip.ObjToInt() : 0, Take);
             }