From 064b3119ecfb826df9582ccea5a1b1947990ab29 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Mon, 8 Jan 2024 12:40:25 +0800
Subject: [PATCH] Synchronization code

---
 .../UpdateProvider/UpdateableHelper.cs        | 23 +++++++-----
 .../Subquery/SubqueryableN.cs                 | 36 +++++++++++++++++++
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableHelper.cs b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableHelper.cs
index 40b812950..85826f479 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableHelper.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableHelper.cs
@@ -726,14 +726,21 @@ namespace SqlSugar
                     item.Columns = new List<DiffLogColumnInfo>();
                     foreach (DataColumn col in dt.Columns)
                     {
-                        var sugarColumn = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).First(it =>
-                            it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase));
-                        DiffLogColumnInfo addItem = new DiffLogColumnInfo();
-                        addItem.Value = row[col.ColumnName];
-                        addItem.ColumnName = col.ColumnName;
-                        addItem.IsPrimaryKey = sugarColumn.IsPrimarykey;
-                        addItem.ColumnDescription = sugarColumn.ColumnDescription;
-                        item.Columns.Add(addItem);
+                        try
+                        {
+                            var sugarColumn = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).First(it =>
+                                              it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase));
+                            DiffLogColumnInfo addItem = new DiffLogColumnInfo();
+                            addItem.Value = row[col.ColumnName];
+                            addItem.ColumnName = col.ColumnName;
+                            addItem.IsPrimaryKey = sugarColumn.IsPrimarykey;
+                            addItem.ColumnDescription = sugarColumn.ColumnDescription;
+                            item.Columns.Add(addItem);
+                        }
+                        catch (Exception ex)
+                        {
+                            Check.ExceptionEasy(col.ColumnName + " No corresponding entity attribute found in difference log ."+ex.Message, col.ColumnName + "在差异日志中可能没有找到相应的实体属性,详细:"+ex.Message);
+                        }
                     }
                     result.Add(item);
                 }
diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubqueryableN.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubqueryableN.cs
index 35a0bf657..e7a251b0c 100644
--- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubqueryableN.cs
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubqueryableN.cs
@@ -446,14 +446,38 @@ namespace SqlSugar
         {
             return this;
         }
+        public Subqueryable<T1, T2, T3> OrderBy(Func<T1, T2, object> expression)
+        {
+            return this;
+        }
+        public new Subqueryable<T1, T2, T3> OrderBy(Func<T1,  object> expression)
+        {
+            return this;
+        }
         public Subqueryable<T1, T2,T3> OrderByDesc(Func<T1, T2,T3, object> expression)
         {
             return this;
         }
+        public Subqueryable<T1, T2, T3> OrderByDesc(Func<T1, T2, object> expression)
+        {
+            return this;
+        }
+        public new Subqueryable<T1, T2, T3> OrderByDesc(Func<T1,object> expression)
+        {
+            return this;
+        }
         public Subqueryable<T1, T2,T3> GroupBy(Func<T1, T2,T3, object> expression)
         {
             return this;
         }
+        public Subqueryable<T1, T2, T3> GroupBy(Func<T1, T2, object> expression)
+        {
+            return this;
+        }
+        public new Subqueryable<T1, T2, T3> GroupBy(Func<T1,object> expression)
+        {
+            return this;
+        }
         public TResult Select<TResult>(Func<T1, T2,T3, TResult> expression) where TResult : struct
         {
             return default(TResult);
@@ -550,14 +574,26 @@ namespace SqlSugar
         {
             return this;
         }
+        public new Subqueryable<T1, T2> OrderBy(Func<T1,object> expression)
+        {
+            return this;
+        }
         public Subqueryable<T1,T2> OrderByDesc(Func<T1,T2, object> expression)
         {
             return this;
         }
+        public new Subqueryable<T1, T2> OrderByDesc(Func<T1,object> expression)
+        {
+            return this;
+        }
         public Subqueryable<T1,T2> GroupBy(Func<T1,T2, object> expression)
         {
             return this;
         }
+        public new  Subqueryable<T1, T2> GroupBy(Func<T1, object> expression)
+        {
+            return this;
+        }
         public Subqueryable<T1,T2> WhereIF(bool isWhere, Func<T1, T2, bool> expression)
         {
             return this;