xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'abp-dev' of https://gitee.com/ccnetcore/Yi into abp-dev

Browse Source
This commit is contained in:
陈淳
2024-03-08 11:00:17 +08:00
parent a63c986c02 2279fb3788
commit 3b3c778a0f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs
View File

@@ -102,7 +102,7 @@ namespace Yi.Framework.SqlSugarCore
} }
if (IsMultiTenantFilterEnabled) if (IsMultiTenantFilterEnabled)
{ {
sqlSugarClient.QueryFilter.AddTableFilter<IMultiTenant>(u => u.TenantId == GuidGenerator.Create()); sqlSugarClient.QueryFilter.AddTableFilter<IMultiTenant>(u => u.TenantId == CurrentTenant.Id);
} }
CustomDataFilter(sqlSugarClient); CustomDataFilter(sqlSugarClient);
} }

4
Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs
View File

@@ -20,7 +20,7 @@ namespace Yi.Framework.SqlSugarCore.Uow
public async Task CommitAsync(CancellationToken cancellationToken = default) public async Task CommitAsync(CancellationToken cancellationToken = default)
{ {
// await _sqlsugarDbContext.SqlSugarClient.Ado.CommitTranAsync(); await _sqlsugarDbContext.SqlSugarClient.Ado.CommitTranAsync();
} }
public void Dispose() public void Dispose()
@@ -29,7 +29,7 @@ namespace Yi.Framework.SqlSugarCore.Uow
public async Task RollbackAsync(CancellationToken cancellationToken = default) public async Task RollbackAsync(CancellationToken cancellationToken = default)
{ {
// await _sqlsugarDbContext.SqlSugarClient.Ado.RollbackTranAsync(); await _sqlsugarDbContext.SqlSugarClient.Ado.RollbackTranAsync();
} }
} }
} }

2
Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs
View File

@@ -127,7 +127,7 @@ namespace Yi.Framework.SqlSugarCore.Uow
); );
unitOfWork.AddTransactionApi(transactionApiKey, transaction); unitOfWork.AddTransactionApi(transactionApiKey, transaction);
// await dbContext.SqlSugarClient.Ado.BeginTranAsync(); await dbContext.SqlSugarClient.Ado.BeginTranAsync();
return dbContext; return dbContext;
} }
else else