- 优化 InsertOrUpdate AsType 使用错误的友好提示；

dotnetcore · Aug 25, 2020 · a634192 · a634192
1 parent a9f9832
commit a634192
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 33 deletions.
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs b/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
@@ -72,30 +72,15 @@ public IInsertOrUpdate<T1> UpdateColumns(string[] columns)
         public static void AuditDataValue(object sender, IEnumerable<T1> data, IFreeSql orm, TableInfo table, Dictionary<string, bool> changedDict)
         {
             if (data?.Any() != true) return;
-            if (orm.Aop.AuditValueHandler == null) return;
             foreach (var d in data)
-            {
-                if (d == null) continue;
-                foreach (var col in table.Columns.Values)
-                {
-                    object val = col.GetValue(d);
-                    var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.InsertOrUpdate, col, table.Properties[col.CsName], val);
-                    orm.Aop.AuditValueHandler(sender, auditArgs);
-                    if (auditArgs.ValueIsChanged)
-                    {
-                        col.SetValue(d, val = auditArgs.Value);
-                        if (changedDict != null && changedDict.ContainsKey(col.Attribute.Name) == false)
-                            changedDict.Add(col.Attribute.Name, true);
-                    }
-                }
-            }
+                AuditDataValue(sender, d, orm, table, changedDict);
         }
         public static void AuditDataValue(object sender, T1 data, IFreeSql orm, TableInfo table, Dictionary<string, bool> changedDict)
         {
-            if (orm.Aop.AuditValueHandler == null) return;
             if (data == null) return;
             if (typeof(T1) == typeof(object) && new[] { table.Type, table.TypeLazy }.Contains(data.GetType()) == false)
                 throw new Exception($"操作的数据类型({data.GetType().DisplayCsharp()}) 与 AsType({table.Type.DisplayCsharp()}) 不一致，请检查。");
+            if (orm.Aop.AuditValueHandler == null) return;
             foreach (var col in table.Columns.Values)
             {
                 object val = col.GetValue(data);