Update core

Author: DotNetNext

Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleQueryBuilder.cs

@@ -21,6 +21,32 @@ public override string SqlTemplate
             }
         }
         public override string ToSqlString()
+        {
+            var oldTake = Take;
+            var oldSkip = Skip;
+            var isDistinctPage = IsDistinct && (Take > 1 || Skip > 1);
+            if (isDistinctPage)
+            {
+                Take = null;
+                Skip = null;
+            }
+            var result = _ToSqlString();
+            if (isDistinctPage)
+            {
+                if (this.OrderByValue.HasValue())
+                {
+                    Take = int.MaxValue;
+                    result = result.Replace("DISTINCT", $" DISTINCT TOP {int.MaxValue} ");
+                }
+                Take = oldTake;
+                Skip = oldSkip;
+                result = this.Context.SqlQueryable<object>(result).Skip(Skip??0).Take(Take??0).ToSql().Key;
+
+
+            }
+            return result;
+        }
+        public  string _ToSqlString()
         {
             string oldOrderBy = this.OrderByValue;
             string externalOrderBy = oldOrderBy;

Src/Asp.NetCore2/SqlSugar/Realization/SqlServer/SqlBuilder/SqlServerQueryBuilder.cs

@@ -35,7 +35,7 @@ public override string ToSqlString()
                 }
                 Take = oldTake;
                 Skip = oldSkip;
-                result =this.Context.SqlQueryable<object>(result).Skip(Skip.Value).Take(Take.Value).ToSql().Key;
+                result =this.Context.SqlQueryable<object>(result).Skip(Skip??0).Take(Take??0).ToSql().Key;
 
 
             }