From a55b633d8409e1beebcd4b7d55c4a0d354fe792f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Fri, 2 Aug 2024 22:37:21 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs | 2 +- .../Yi.Framework.Rbac.Domain/Entities/ConfigAggregateRoot.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs index 1e13c5eb..0712e96d 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs @@ -150,7 +150,7 @@ namespace Yi.Framework.SqlSugarCore } if (IsMultiTenantFilterEnabled) { - //解决表字段隔离时，启动租户异常，CurrentTenant为null时给默认租户 + //表达式不能放方法 Guid? tenantId = CurrentTenant?.Id; sqlSugarClient.QueryFilter.AddTableFilter(u => u.TenantId == tenantId); } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/ConfigAggregateRoot.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/ConfigAggregateRoot.cs index 87b01365..c7bf7629 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/ConfigAggregateRoot.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/ConfigAggregateRoot.cs @@ -2,6 +2,7 @@ using Volo.Abp; using Volo.Abp.Auditing; using Volo.Abp.Domain.Entities; +using Volo.Abp.MultiTenancy; using Yi.Framework.Core.Data; namespace Yi.Framework.Rbac.Domain.Entities @@ -10,7 +11,7 @@ namespace Yi.Framework.Rbac.Domain.Entities /// 配置表 /// [SugarTable("Config")] - public class ConfigAggregateRoot : AggregateRoot, IAuditedObject, IOrderNum, ISoftDelete + public class ConfigAggregateRoot : AggregateRoot, IAuditedObject, IOrderNum, ISoftDelete,IMultiTenant { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] public override Guid Id { get; protected set; } @@ -54,5 +55,6 @@ namespace Yi.Framework.Rbac.Domain.Entities public Guid? LastModifierId { get; set; } public DateTime? LastModificationTime { get; set; } + public Guid? TenantId { get; } } }