From 37ef2ccf7ae11e30e7da926b34e8b0b29aca0962 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 22 Jul 2022 12:40:41 +0800
Subject: [PATCH] Check `TenantSideFeatures` only if tenant is available.

---
 .../Pages/SettingManagement/SettingPageContributorManager.cs  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs
index e1f597b85a..9b08236cae 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs
@@ -66,7 +66,9 @@ public class SettingPageContributorManager : IScopedDependency
             if (available)
             {
                 var requiredTenantSideFeatures = contributor.GetRequiredFeatures(MultiTenancySides.Tenant);
-                if (requiredTenantSideFeatures.Any() && !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray()))
+                if (requiredTenantSideFeatures.Any() &&
+                    ServiceProvider.GetRequiredService<ICurrentTenant>().IsAvailable &&
+                    !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray()))
                 {
                     available = false;
                 }