From c72fb7c05e2df528b0b76bf3f646a66cceb92561 Mon Sep 17 00:00:00 2001
From: zhouhr <zhouhr@fortrust.cn>
Date: Fri, 2 Aug 2024 17:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A1=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB=E6=97=B6=EF=BC=8C=E5=90=AF=E5=8A=A8=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs
index 5fa812af..1e13c5eb 100644
--- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs
@@ -150,7 +150,9 @@ namespace Yi.Framework.SqlSugarCore
             }
             if (IsMultiTenantFilterEnabled)
             {
-                sqlSugarClient.QueryFilter.AddTableFilter<IMultiTenant>(u => u.TenantId == CurrentTenant.Id);
+                //解决表字段隔离时，启动租户异常，CurrentTenant为null时给默认租户
+                Guid? tenantId = CurrentTenant?.Id;
+                sqlSugarClient.QueryFilter.AddTableFilter<IMultiTenant>(u => u.TenantId == tenantId);
             }
             CustomDataFilter(sqlSugarClient);
         }