- 修复 InsertOrUpdate 更新时触发两次 AuditValue；#2020

Author: 2881099

FreeSql.DbContext/DbSet/DbSetAsync.cs

@@ -446,7 +446,7 @@ async public Task UpdateAsync(TEntity data, CancellationToken cancellationToken
         async Task UpdateRangePrivAsync(IEnumerable<TEntity> data, bool isCheck, CancellationToken cancellationToken)
         {
             if (data is List<TEntity> == false) data = data?.ToList();
-            if (CanUpdate(data, true) == false) return;
+            if (isCheck && CanUpdate(data, true) == false) return;
             foreach (var item in data)
             {
                 if (_dicUpdateTimes.ContainsKey(item))

FreeSql.DbContext/DbSet/DbSetSync.cs

@@ -419,7 +419,7 @@ public void Update(TEntity data)
         void UpdateRangePriv(IEnumerable<TEntity> data, bool isCheck)
         {
             if (data is List<TEntity> == false) data = data?.ToList();
-            if (CanUpdate(data, true) == false) return;
+            if (isCheck && CanUpdate(data, true) == false) return;
             foreach (var item in data)
             {
                 if (_dicUpdateTimes.ContainsKey(item))

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -41,5 +41,30 @@ public class AppInfoEntity
             public string AppName { get; set; }
         }
 
+        [Fact]
+        async public Task TestIssues()
+        {
+            using (var freeSql = g.CreateMemory())
+            {
+                freeSql.Aop.AuditValue += (_, args) =>
+                {
+                    Console.WriteLine(args.AuditValueType);
+                    Console.WriteLine(args.Property.Name);
+                };
+
+                var repository = freeSql.GetRepository<People>();
+                var people = new People { Name = "John Doe" };
+                await repository.InsertOrUpdateAsync(people);
+                people.Name = "Tim Doe";
+                await repository.InsertOrUpdateAsync(people);
+            }
+        }
+
+        public class People
+        {
+            [Column(IsPrimary = true, IsIdentity = true)]
+            public int Id { get; set; }
+            public string Name { get; set; } = string.Empty;
+        }
     }
 }

FreeSql.Tests/FreeSql.Tests.DbContext2/CompareStateTest.cs

@@ -12,9 +12,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-		<PackageReference Include="xunit" Version="2.4.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>