From c5b59aa28a28d679d1f0d7a375fcd6b18ad0e2b8 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 21 Dec 2023 19:30:12 +0800 Subject: [PATCH] Synchronization code --- .../SqlSugar/Abstract/SugarProvider/SqlSugarCoreProvider.cs | 2 +- .../SqlSugar/Abstract/SugarProvider/SqlSugarScopeProvider.cs | 2 +- .../SqlSugar/Abstract/UpdateProvider/UpdateablePage.cs | 2 +- .../SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarCoreProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarCoreProvider.cs index b2fead0a3..b3ac0c01d 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarCoreProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarCoreProvider.cs @@ -25,7 +25,7 @@ namespace SqlSugar var isAsync = UtilMethods.IsAnyAsyncMethod(methods); if (methods.Length>=0) { - foreach (var method in methods.Take(25)) + foreach (var method in methods.Take(35)) { var refType = method.GetMethod()?.ReflectedType; if (refType != null) diff --git a/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarScopeProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarScopeProvider.cs index b79b8761a..0fe6e8ca5 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarScopeProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarScopeProvider.cs @@ -96,7 +96,7 @@ namespace SqlSugar } if (frames.Length >= 0) { - foreach (var method in frames.Take(15)) + foreach (var method in frames.Take(35)) { var refType = method.GetMethod()?.ReflectedType; if (refType != null) diff --git a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateablePage.cs b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateablePage.cs index fe9a09e07..b2fffe5f7 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateablePage.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateablePage.cs @@ -14,7 +14,7 @@ namespace SqlSugar public string TableName { get; internal set; } public bool IsEnableDiffLogEvent { get; internal set; } public DiffLogModel DiffModel { get; internal set; } - public List UpdateColumns { get; internal set; } + public List UpdateColumns { get; internal set; } public string[] WhereColumnList { get; internal set; } public UpdateableFilter EnableQueryFilter() diff --git a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs index 04c805613..3b12191de 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs @@ -191,9 +191,11 @@ namespace SqlSugar result.TableName = this.UpdateBuilder.TableName; result.IsEnableDiffLogEvent = this.IsEnableDiffLogEvent; result.WhereColumnList = this.WhereColumnList?.ToArray(); - result.DiffModel = this.diffModel; + result.DiffModel = this.diffModel; if (this.UpdateBuilder.DbColumnInfoList.Any()) result.UpdateColumns = this.UpdateBuilder.DbColumnInfoList.GroupBy(it => it.TableId).First().Select(it => it.DbColumnName).ToList(); + if(this.UpdateBuilder?.UpdateColumns?.Any()==true) + result.UpdateColumns = this.UpdateBuilder.UpdateColumns; return result; } public IUpdateable InnerJoin(Expression> joinExpress)