From 458cf0d116c63c1c92f31f7af41fa484602430fd Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Tue, 23 Aug 2022 17:50:16 +0800
Subject: [PATCH] Update .net core project

---
 .../QueryableProvider/QueryableProvider.cs    | 81 ++++++++++++++++++-
 .../SqlSugar/Interface/IQueryable.cs          | 10 +++
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
index 164972827..065e67227 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
@@ -855,7 +855,14 @@ namespace SqlSugar
             _GroupBy(expression);
             return this;
         }
-
+        public virtual ISugarQueryable<T> GroupByIF(bool isGroupBy,Expression<Func<T, object>> expression)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(expression);
+            }
+            return this;
+        }
         public virtual ISugarQueryable<T> OrderByIF(bool isOrderBy, string orderFileds)
         {
             if (isOrderBy)
@@ -3703,6 +3710,22 @@ namespace SqlSugar
         #endregion
 
         #region GroupBy
+        public new virtual ISugarQueryable<T,T2> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(expression);
+            }
+            return this;
+        }
+        public virtual ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(expression);
+            }
+            return this;
+        }
         public new virtual ISugarQueryable<T,T2> HavingIF(bool isHaving, Expression<Func<T, bool>> expression)
         {
             if (isHaving)
@@ -4027,6 +4050,30 @@ namespace SqlSugar
         }
 
         #region  Group 
+        public new virtual ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(expression);
+            }
+            return this;
+        }
+        public virtual ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(expression);
+            }
+            return this;
+        }
+        public virtual ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3, object>> expression)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(expression);
+            }
+            return this;
+        }
         public ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, T2, T3, object>> expression)
         {
             _GroupBy(expression);
@@ -4729,6 +4776,38 @@ namespace SqlSugar
         #endregion
 
         #region GroupBy
+        public new virtual ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(expression);
+            }
+            return this;
+        }
+        public virtual ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(expression);
+            }
+            return this;
+        }
+        public virtual ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3, object>> expression)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(expression);
+            }
+            return this;
+        }
+        public virtual ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3,T4, object>> expression)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(expression);
+            }
+            return this;
+        }
         public new ISugarQueryable<T, T2, T3, T4> GroupBy(Expression<Func<T, object>> expression)
         {
             _GroupBy(expression);
diff --git a/Src/Asp.NetCore2/SqlSugar/Interface/IQueryable.cs b/Src/Asp.NetCore2/SqlSugar/Interface/IQueryable.cs
index 989b034a7..55548382c 100644
--- a/Src/Asp.NetCore2/SqlSugar/Interface/IQueryable.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Interface/IQueryable.cs
@@ -90,6 +90,7 @@ namespace SqlSugar
 
         ISugarQueryable<T> GroupBy(Expression<Func<T, object>> expression);
         ISugarQueryable<T> GroupBy(string groupFileds);
+        ISugarQueryable<T> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression);
 
         ISugarQueryable<T> PartitionBy(Expression<Func<T, object>> expression);
         ISugarQueryable<T> PartitionBy(string groupFileds);
@@ -257,6 +258,8 @@ namespace SqlSugar
         #region GroupBy
         new ISugarQueryable<T, T2> GroupBy(Expression<Func<T, object>> expression);
         ISugarQueryable<T, T2> GroupBy(Expression<Func<T, T2, object>> expression);
+        new ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression);
+        ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, Expression<Func<T,T2, object>> expression);
         new ISugarQueryable<T, T2> Having(Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2> Having(Expression<Func<T, T2, bool>> expression);
         new ISugarQueryable<T, T2> Having(string whereString, object whereObj = null);
@@ -361,6 +364,9 @@ namespace SqlSugar
         new ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, object>> expression);
         ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, T2, object>> expression);
         ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, T2, T3, object>> expression);
+        new ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression);
+        ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression);
+        ISugarQueryable<T, T2,T3> GroupByIF(bool isGroupBy, Expression<Func<T, T2,T3, object>> expression);
         new ISugarQueryable<T, T2, T3> Having(Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3> Having(Expression<Func<T, T2, bool>> expression);
         ISugarQueryable<T, T2, T3> Having(Expression<Func<T, T2, T3, bool>> expression);
@@ -479,6 +485,10 @@ namespace SqlSugar
         ISugarQueryable<T, T2, T3, T4> GroupBy(Expression<Func<T, T2, object>> expression);
         ISugarQueryable<T, T2, T3, T4> GroupBy(Expression<Func<T, T2, T3, object>> expression);
         ISugarQueryable<T, T2, T3, T4> GroupBy(Expression<Func<T, T2, T3, T4, object>> expression);
+        new ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy,Expression<Func<T, object>> expression);
+        ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression);
+        ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3, object>> expression);
+        ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3,T4, object>> expression);
         new ISugarQueryable<T, T2, T3, T4> Having(Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3, T4> Having(Expression<Func<T, T2, bool>> expression);
         ISugarQueryable<T, T2, T3, T4> Having(Expression<Func<T, T2, T3, bool>> expression);