From e0e8c79a0166e52fd78b2d5ee8f9a0a91cb8dc94 Mon Sep 17 00:00:00 2001
From: orches <OrchesAdam@outlook.com>
Date: Thu, 20 Jul 2023 10:11:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A9=E5=85=85GroupByIfWithStringFields?=
 =?UTF-8?q?=E5=88=B0=E6=9B=B4=E5=A4=9A=E7=9A=84=E6=B3=9B=E5=9E=8B=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QueryableProvider02-05.cs                 | 30 +++++++++++++++++++
 .../SqlSugar/Interface/IQueryable.cs          |  3 ++
 2 files changed, 33 insertions(+)

diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs
index 65ded1e71..10171bb0f 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs
@@ -361,6 +361,16 @@ namespace SqlSugar
             }
             return this;
         }
+        
+        public new virtual ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, string groupFields)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(groupFields);
+            }
+            return this;
+        }
+        
         public new virtual ISugarQueryable<T, T2> HavingIF(bool isHaving, Expression<Func<T, bool>> expression)
         {
             if (isHaving)
@@ -855,6 +865,16 @@ namespace SqlSugar
             }
             return this;
         }
+        
+        public new virtual ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, string groupFields)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(groupFields);
+            }
+            return this;
+        }
+        
         public ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, T2, T3, object>> expression)
         {
             _GroupBy(expression);
@@ -1763,6 +1783,16 @@ namespace SqlSugar
             }
             return this;
         }
+        
+        public new virtual ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, string groupFields)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(groupFields);
+            }
+            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 8c01a4cea..2015a9951 100644
--- a/Src/Asp.NetCore2/SqlSugar/Interface/IQueryable.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Interface/IQueryable.cs
@@ -346,6 +346,7 @@ namespace SqlSugar
         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);
+        ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, string groupFields);
         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);
@@ -475,6 +476,7 @@ namespace SqlSugar
         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> GroupByIF(bool isGroupBy, string groupFields);
         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);
@@ -615,6 +617,7 @@ namespace SqlSugar
         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> GroupByIF(bool isGroupBy, string groupFields);
         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);