修复dapper 更新方法update事务参数无效的问题

283591387@qq.com · 283591387@qq.com · commit 49b53fcb2c5d · 2022-05-23T12:02:37.000+08:00
diff --git a/.Net6版本/VOL.Core/Dapper/SqlDapper.cs b/.Net6版本/VOL.Core/Dapper/SqlDapper.cs
@@ -616,7 +616,7 @@ public int AddRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> addF
         /// <param name="updateFileds">指定更新的字段x=new {x.a,x.b}</param>
         /// <param name="beginTransaction">是否开启事务</param>
         /// <returns></returns>
-        public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = true)
+        public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = false)
         {
             return UpdateRange<T>(new T[] { entity }, updateFileds, beginTransaction);
         }
@@ -629,7 +629,7 @@ public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null,
         /// <param name="updateFileds">批定更新字段</param>
         /// <param name="beginTransaction"></param>
         /// <returns></returns>
-        public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = true)
+        public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = false)
         {
             Type entityType = typeof(T);
             var key = entityType.GetKeyProperty();
@@ -654,13 +654,13 @@ public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> u
                 }
                 string sqltext = $@"UPDATE { entityType.GetEntityTableName()} SET {string.Join(",", paramsList)} WHERE {entityType.GetKeyName()} = @{entityType.GetKeyName()} ;";
 
-                return ExcuteNonQuery(sqltext, entities, CommandType.Text, true);
+                return ExcuteNonQuery(sqltext, entities, CommandType.Text, beginTransaction);
                 // throw new Exception("mysql批量更新未实现");
             }
             string fileds = string.Join(",", properties.Select(x => $" a.{x.Name}=b.{x.Name}").ToArray());
             string sql = $"update  a  set {fileds} from  {entityType.GetEntityTableName()} as a inner join {EntityToSqlTempName.TempInsert.ToString()} as b on a.{key.Name}=b.{key.Name}";
             sql = entities.ToList().GetEntitySql(true, sql, null, updateFileds, null);
-            return ExcuteNonQuery(sql, null, CommandType.Text, true);
+            return ExcuteNonQuery(sql, null, CommandType.Text, beginTransaction);
         }
 
         public int DelWithKey<T>(bool beginTransaction = false, params object[] keys)
diff --git a/Vue.Net/VOL.Core/Dapper/SqlDapper.cs b/Vue.Net/VOL.Core/Dapper/SqlDapper.cs
@@ -616,7 +616,7 @@ public int AddRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> addF
         /// <param name="updateFileds">指定更新的字段x=new {x.a,x.b}</param>
         /// <param name="beginTransaction">是否开启事务</param>
         /// <returns></returns>
-        public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = true)
+        public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = false)
         {
             return UpdateRange<T>(new T[] { entity }, updateFileds, beginTransaction);
         }
@@ -629,7 +629,7 @@ public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null,
         /// <param name="updateFileds">批定更新字段</param>
         /// <param name="beginTransaction"></param>
         /// <returns></returns>
-        public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = true)
+        public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = false)
         {
             Type entityType = typeof(T);
             var key = entityType.GetKeyProperty();
@@ -654,13 +654,13 @@ public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> u
                 }
                 string sqltext = $@"UPDATE { entityType.GetEntityTableName()} SET {string.Join(",", paramsList)} WHERE {entityType.GetKeyName()} = @{entityType.GetKeyName()} ;";
 
-                return ExcuteNonQuery(sqltext, entities, CommandType.Text, true);
+                return ExcuteNonQuery(sqltext, entities, CommandType.Text, beginTransaction);
                 // throw new Exception("mysql批量更新未实现");
             }
             string fileds = string.Join(",", properties.Select(x => $" a.{x.Name}=b.{x.Name}").ToArray());
             string sql = $"update  a  set {fileds} from  {entityType.GetEntityTableName()} as a inner join {EntityToSqlTempName.TempInsert.ToString()} as b on a.{key.Name}=b.{key.Name}";
             sql = entities.ToList().GetEntitySql(true, sql, null, updateFileds, null);
-            return ExcuteNonQuery(sql, null, CommandType.Text, true);
+            return ExcuteNonQuery(sql, null, CommandType.Text, beginTransaction);
         }
 
         public int DelWithKey<T>(bool beginTransaction = false, params object[] keys)
diff --git a/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/Dapper/SqlDapper.cs b/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/Dapper/SqlDapper.cs
@@ -616,7 +616,7 @@ public int AddRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> addF
         /// <param name="updateFileds">指定更新的字段x=new {x.a,x.b}</param>
         /// <param name="beginTransaction">是否开启事务</param>
         /// <returns></returns>
-        public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = true)
+        public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = false)
         {
             return UpdateRange<T>(new T[] { entity }, updateFileds, beginTransaction);
         }
@@ -629,7 +629,7 @@ public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null,
         /// <param name="updateFileds">批定更新字段</param>
         /// <param name="beginTransaction"></param>
         /// <returns></returns>
-        public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = true)
+        public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = false)
         {
             Type entityType = typeof(T);
             var key = entityType.GetKeyProperty();
@@ -654,13 +654,13 @@ public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> u
                 }
                 string sqltext = $@"UPDATE { entityType.GetEntityTableName()} SET {string.Join(",", paramsList)} WHERE {entityType.GetKeyName()} = @{entityType.GetKeyName()} ;";
 
-                return ExcuteNonQuery(sqltext, entities, CommandType.Text, true);
+                return ExcuteNonQuery(sqltext, entities, CommandType.Text, beginTransaction);
                 // throw new Exception("mysql批量更新未实现");
             }
             string fileds = string.Join(",", properties.Select(x => $" a.{x.Name}=b.{x.Name}").ToArray());
             string sql = $"update  a  set {fileds} from  {entityType.GetEntityTableName()} as a inner join {EntityToSqlTempName.TempInsert.ToString()} as b on a.{key.Name}=b.{key.Name}";
             sql = entities.ToList().GetEntitySql(true, sql, null, updateFileds, null);
-            return ExcuteNonQuery(sql, null, CommandType.Text, true);
+            return ExcuteNonQuery(sql, null, CommandType.Text, beginTransaction);
         }
 
         public int DelWithKey<T>(bool beginTransaction = false, params object[] keys)

Original file line number	Diff line number	Diff line change
`@@ -616,7 +616,7 @@ public int AddRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> addF`
`616`	`616`	`/// <param name="updateFileds">指定更新的字段x=new {x.a,x.b}</param>`
`617`	`617`	`/// <param name="beginTransaction">是否开启事务</param>`
`618`	`618`	`/// <returns></returns>`
`619`		`- public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = true)`
	`619`	`+ public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = false)`
`620`	`620`	`{`
`621`	`621`	`return UpdateRange<T>(new T[] { entity }, updateFileds, beginTransaction);`
`622`	`622`	`}`
`@@ -629,7 +629,7 @@ public int Update<T>(T entity, Expression<Func<T, object>> updateFileds = null,`
`629`	`629`	`/// <param name="updateFileds">批定更新字段</param>`
`630`	`630`	`/// <param name="beginTransaction"></param>`
`631`	`631`	`/// <returns></returns>`
`632`		`- public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = true)`
	`632`	`+ public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> updateFileds = null, bool beginTransaction = false)`
`633`	`633`	`{`
`634`	`634`	`Type entityType = typeof(T);`
`635`	`635`	`var key = entityType.GetKeyProperty();`
`@@ -654,13 +654,13 @@ public int UpdateRange<T>(IEnumerable<T> entities, Expression<Func<T, object>> u`
`654`	`654`	`}`
`655`	`655`	`string sqltext = $@"UPDATE { entityType.GetEntityTableName()} SET {string.Join(",", paramsList)} WHERE {entityType.GetKeyName()} = @{entityType.GetKeyName()} ;";`
`656`	`656`
`657`		`- return ExcuteNonQuery(sqltext, entities, CommandType.Text, true);`
	`657`	`+ return ExcuteNonQuery(sqltext, entities, CommandType.Text, beginTransaction);`
`658`	`658`	`// throw new Exception("mysql批量更新未实现");`
`659`	`659`	`}`
`660`	`660`	`string fileds = string.Join(",", properties.Select(x => $" a.{x.Name}=b.{x.Name}").ToArray());`
`661`	`661`	`string sql = $"update a set {fileds} from {entityType.GetEntityTableName()} as a inner join {EntityToSqlTempName.TempInsert.ToString()} as b on a.{key.Name}=b.{key.Name}";`
`662`	`662`	`sql = entities.ToList().GetEntitySql(true, sql, null, updateFileds, null);`
`663`		`- return ExcuteNonQuery(sql, null, CommandType.Text, true);`
	`663`	`+ return ExcuteNonQuery(sql, null, CommandType.Text, beginTransaction);`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`public int DelWithKey<T>(bool beginTransaction = false, params object[] keys)`