Fixed #716: Tenant and Use setting issue.

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantSettingValueProvider.cs

@@ -19,27 +19,27 @@ namespace Volo.Abp.MultiTenancy
 
         public override async Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
         {
-            if (providerKey == null)
-            {
-                if (CurrentTenant.Id == null)
-                {
-                    return null;
-                }
-
-                providerKey = CurrentTenant.Id.ToString();
-            }
-
-            return await SettingStore.GetOrNullAsync(setting.Name, Name, providerKey);
+            return await SettingStore.GetOrNullAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
         }
 
         public override Task SetAsync(SettingDefinition setting, string value, string providerKey)
         {
-            return SettingStore.SetAsync(setting.Name, value, Name, providerKey);
+            return SettingStore.SetAsync(setting.Name, value, Name, NormalizeProviderKey(providerKey));
         }
 
         public override Task ClearAsync(SettingDefinition setting, string providerKey)
         {
-            return SettingStore.DeleteAsync(setting.Name, Name, providerKey);
+            return SettingStore.DeleteAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
+        }
+
+        private string NormalizeProviderKey(string providerKey)
+        {
+            if (providerKey == null && CurrentTenant.Id.HasValue)
+            {
+                return CurrentTenant.Id.Value.ToString();
+            }
+
+            return providerKey;
         }
     }
 }

modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserSettingValueProvider.cs

@@ -22,27 +22,27 @@ namespace Volo.Abp.Users
 
         public override async Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
         {
-            if (providerKey == null)
-            {
-                if (CurrentUser.Id == null)
-                {
-                    return null;
-                }
-
-                providerKey = CurrentUser.Id.ToString();
-            }
-
-            return await SettingStore.GetOrNullAsync(setting.Name, Name, providerKey);
+            return await SettingStore.GetOrNullAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
         }
 
         public override Task SetAsync(SettingDefinition setting, string value, string providerKey)
         {
-            return SettingStore.SetAsync(setting.Name, value, Name, providerKey);
+            return SettingStore.SetAsync(setting.Name, value, Name, NormalizeProviderKey(providerKey));
         }
 
         public override Task ClearAsync(SettingDefinition setting, string providerKey)
         {
-            return SettingStore.DeleteAsync(setting.Name, Name, providerKey);
+            return SettingStore.DeleteAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
+        }
+
+        private string NormalizeProviderKey(string providerKey)
+        {
+            if (providerKey == null && CurrentUser.Id.HasValue)
+            {
+                return CurrentUser.Id.Value.ToString();
+            }
+
+            return providerKey;
         }
     }
 }