From fac8cb9abfcd7c7c8e3ab7768996cdd2b12334f2 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Mon, 26 Jun 2023 18:40:13 +0800
Subject: [PATCH] Synchronization code

---
 .../Abstract/ExecuteNavProvider/UpdateNavOneToOne.cs |  2 +-
 .../Abstract/QueryableProvider/QueryableProvider.cs  | 12 ++++++++++++
 Src/Asp.Net/SqlSugar/Interface/IQueryable.cs         |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Src/Asp.Net/SqlSugar/Abstract/ExecuteNavProvider/UpdateNavOneToOne.cs b/Src/Asp.Net/SqlSugar/Abstract/ExecuteNavProvider/UpdateNavOneToOne.cs
index 8fdf3e27e..00edc927b 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/ExecuteNavProvider/UpdateNavOneToOne.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/ExecuteNavProvider/UpdateNavOneToOne.cs
@@ -35,7 +35,7 @@ namespace SqlSugar
                         }
 
                     }
-                    if (!IsDefaultValue(navPropertyValue)&& isManyPk==false)
+                    if (!IsDefaultValue(navPropertyValue)&& isManyPk==false&& parentPkColumn.IsIdentity==false)
                     {
                         this._Context.Updateable<DbTableInfo>
                            ().AS(parentEntity.DbTableName)
diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
index f304f19a8..85dc8d5e4 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
@@ -1078,6 +1078,18 @@ namespace SqlSugar
             }
             return this;
         }
+
+        public ISugarQueryable<T> GroupByIF(bool isGroupBy, string groupFields)
+        {
+            if (isGroupBy)
+            {
+                GroupBy(groupFields);
+            }
+
+            return this;
+        }
+
+
         public virtual ISugarQueryable<T> OrderByIF(bool isOrderBy, string orderFileds)
         {
             if (isOrderBy)
diff --git a/Src/Asp.Net/SqlSugar/Interface/IQueryable.cs b/Src/Asp.Net/SqlSugar/Interface/IQueryable.cs
index 9d20283d2..2b458a181 100644
--- a/Src/Asp.Net/SqlSugar/Interface/IQueryable.cs
+++ b/Src/Asp.Net/SqlSugar/Interface/IQueryable.cs
@@ -117,6 +117,8 @@ namespace SqlSugar
         ISugarQueryable<T> GroupBy(string groupFileds);
         ISugarQueryable<T> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression);
 
+        ISugarQueryable<T> GroupByIF(bool isGroupBy, string groupFields);
+
         ISugarQueryable<T> PartitionBy(Expression<Func<T, object>> expression);
         ISugarQueryable<T> PartitionBy(string groupFileds);