From f0ae259040a0cf5e1aa954fbf2f672a74a0b45a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Thu, 7 Mar 2024 22:31:01 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9F=A5=E7=BC=BA=E8=A1=A5=E6=BC=8F?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs  | 2 +-
 .../Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs   | 4 ++--
 .../Uow/UnitOfWorkSqlsugarDbContextProvider.cs                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs
index edfcf258..e99d7da2 100644
--- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs
@@ -102,7 +102,7 @@ namespace Yi.Framework.SqlSugarCore
             }
             if (IsMultiTenantFilterEnabled)
             {
-                sqlSugarClient.QueryFilter.AddTableFilter<IMultiTenant>(u => u.TenantId == GuidGenerator.Create());
+                sqlSugarClient.QueryFilter.AddTableFilter<IMultiTenant>(u => u.TenantId == CurrentTenant.Id);
             }
             CustomDataFilter(sqlSugarClient);
         }
diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs
index 6e49fa9f..44ea1419 100644
--- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs
@@ -20,7 +20,7 @@ namespace Yi.Framework.SqlSugarCore.Uow
 
         public async Task CommitAsync(CancellationToken cancellationToken = default)
         {
-          //  await _sqlsugarDbContext.SqlSugarClient.Ado.CommitTranAsync();
+            await _sqlsugarDbContext.SqlSugarClient.Ado.CommitTranAsync();
         }
 
         public void Dispose()
@@ -29,7 +29,7 @@ namespace Yi.Framework.SqlSugarCore.Uow
 
         public async Task RollbackAsync(CancellationToken cancellationToken = default)
         {
-         //   await _sqlsugarDbContext.SqlSugarClient.Ado.RollbackTranAsync();
+            await _sqlsugarDbContext.SqlSugarClient.Ado.RollbackTranAsync();
         }
     }
 }
diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs
index 4c5317e9..8fe45bae 100644
--- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs
@@ -127,7 +127,7 @@ namespace Yi.Framework.SqlSugarCore.Uow
                       );
                 unitOfWork.AddTransactionApi(transactionApiKey, transaction);
 
-               // await dbContext.SqlSugarClient.Ado.BeginTranAsync();
+                await dbContext.SqlSugarClient.Ado.BeginTranAsync();
                 return dbContext;
             }
             else