- 修复 #454 优化遗留的 bug，影响 Aop.AuditValue 事件；#521

dotnetcore · Nov 6, 2020 · a73e882 · a73e882
1 parent 5ad30cc
commit a73e882
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests/Issues/521.cs b/FreeSql.Tests/FreeSql.Tests/Issues/521.cs
@@ -5,6 +5,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using Xunit;
@@ -17,6 +18,18 @@ public class _521
         public void SelectTest()
         {
             IFreeSql fsql = g.sqlserver;
+
+            //fsql.Aop.AuditValue += (s, e) => {
+            //    if (e.Column.CsType == typeof(long)
+            //        && e.Property.GetCustomAttribute<SnowflakeAttribute>(false) != null
+            //        && e.Value?.ToString() == "0")
+            //    {
+            //        e.Value = 1;
+            //    }
+
+            //};
+
+
             fsql.Delete<ts521>().Where("1=1").ExecuteAffrows();
             fsql.Insert(new ts521 { ID = 1000000000000000001 }).ExecuteAffrows();
 
@@ -28,6 +41,7 @@ public void SelectTest()
         class ts521
         {
             [Key]
+            [Snowflake]
             public long ID { get; set; }
 
             [Description("名字")]
@@ -44,5 +58,6 @@ class ts521
             [Column(IsVersion = true, InsertValueSql = "1")]
             public long Version { get; set; }
         }
+        public class SnowflakeAttribute: Attribute { }
     }
 }
diff --git a/FreeSql/Internal/CommonProvider/UpdateProvider.cs b/FreeSql/Internal/CommonProvider/UpdateProvider.cs
@@ -374,7 +374,7 @@ public static void AuditDataValue(object sender, IEnumerable<T1> data, IFreeSql
                             changedDict.Add(col.Attribute.Name, true);
                     }
                     if (val == null && col.Attribute.MapType == typeof(string) && col.Attribute.IsNullable == false)
-                        col.SetValue(data, val = "");
+                        col.SetValue(d, val = "");
                 }
             }
         }