From 974eb0b189cb062e3f7832db1d330f4b1f69b7f0 Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Wed, 2 Nov 2022 00:14:48 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20=E8=81=9A=E5=90=88?=
 =?UTF-8?q?=E6=A0=B9=E4=BB=93=E5=82=A8=20Update=20=E6=9C=AA=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=87=AA=E5=A2=9E=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=20bug=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AggregateRootRepositoryAsync.cs                       | 8 ++++----
 .../AggregateRootRepositorySync.cs                        | 6 +++---
 .../FreeSql.Extensions.AggregateRoot.csproj               | 6 ++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositoryAsync.cs b/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositoryAsync.cs
index e0d40715..d041fc58 100644
--- a/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositoryAsync.cs
+++ b/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositoryAsync.cs
@@ -176,7 +176,7 @@ namespace FreeSql
         }
 
         public virtual Task<int> UpdateAsync(TEntity entity, CancellationToken cancellationToken = default) => UpdateAsync(new[] { entity }, cancellationToken);
-        public virtual Task<int> UpdateAsync(IEnumerable<TEntity> entitys, CancellationToken cancellationToken = default)
+        async public virtual Task<int> UpdateAsync(IEnumerable<TEntity> entitys, CancellationToken cancellationToken = default)
         {
             var tracking = new AggregateRootTrackingChangeInfo();
             foreach (var entity in entitys)
@@ -185,10 +185,10 @@ namespace FreeSql
                 if (_states.TryGetValue(stateKey, out var state) == false) throw new Exception($"AggregateRootRepository 使用仓储对象查询后，才可以更新数据 {Orm.GetEntityString(EntityType, entity)}");
                 AggregateRootUtils.CompareEntityValue(_boundaryName, Orm, EntityType, state.Value, entity, null, tracking);
             }
+            var affrows = await SaveTrackingChangeAsync(tracking, cancellationToken);
             foreach (var entity in entitys)
                 Attach(entity);
-
-            return SaveTrackingChangeAsync(tracking, cancellationToken);
+            return affrows;
         }
 
 
@@ -233,8 +233,8 @@ namespace FreeSql
             var stateKey = Orm.GetEntityKeyString(EntityType, entity, false);
             if (_states.TryGetValue(stateKey, out var state) == false) throw new Exception($"AggregateRootRepository 使用仓储对象查询后，才可以保存数据 {Orm.GetEntityString(EntityType, entity)}");
             AggregateRootUtils.CompareEntityValue(_boundaryName, Orm, EntityType, state.Value, entity, propertyName, tracking);
-            Attach(entity); //应该只存储 propertyName 内容
             await SaveTrackingChangeAsync(tracking, cancellationToken);
+            Attach(entity); //应该只存储 propertyName 内容
         }
 
 
diff --git a/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositorySync.cs b/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositorySync.cs
index 7dd14422..a29d24cf 100644
--- a/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositorySync.cs
+++ b/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositorySync.cs
@@ -238,10 +238,10 @@ namespace FreeSql
                 if (_states.TryGetValue(stateKey, out var state) == false) throw new Exception($"AggregateRootRepository 使用仓储对象查询后，才可以更新数据 {Orm.GetEntityString(EntityType, entity)}");
                 AggregateRootUtils.CompareEntityValue(_boundaryName, Orm, EntityType, state.Value, entity, null, tracking);
             }
+            var affrows = SaveTrackingChange(tracking);
             foreach (var entity in entitys)
                 Attach(entity);
-
-            return SaveTrackingChange(tracking);
+            return affrows;
         }
 
         public virtual int Delete(TEntity entity) => DeleteWithinBoundary(new[] { entity }, null);
@@ -285,8 +285,8 @@ namespace FreeSql
             var stateKey = Orm.GetEntityKeyString(EntityType, entity, false);
             if (_states.TryGetValue(stateKey, out var state) == false) throw new Exception($"AggregateRootRepository 使用仓储对象查询后，才可以保存数据 {Orm.GetEntityString(EntityType, entity)}");
             AggregateRootUtils.CompareEntityValue(_boundaryName, Orm, EntityType, state.Value, entity, propertyName, tracking);
-            Attach(entity); //应该只存储 propertyName 内容
             SaveTrackingChange(tracking);
+            Attach(entity); //应该只存储 propertyName 内容
         }
 
 
diff --git a/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj b/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
index 911f11b4..5cf8fedd 100644
--- a/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
+++ b/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>1.0.2</Version>
+		<Version>1.0.3</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -26,15 +26,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="FreeSql.DbContext" Version="3.2.682" />
+	  <ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext.csproj" />
 	</ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
 		<DocumentationFile>FreeSql.Extensions.AggregateRoot.xml</DocumentationFile>
 		<WarningLevel>3</WarningLevel>
 	</PropertyGroup>
-
-
 	
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
 		<DefineConstants>net40</DefineConstants>