Merge pull request #113 from EasyAbp/avoid-overwriting-with-null-values

Avoid overwriting the encrypted values with null

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.0.0</Version>
+    <Version>2.0.1</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs

@@ -146,6 +146,17 @@ public virtual async Task SetSettingValuesAsync(Dictionary<string, string> setti
 					continue;
 				}
 
+				// new value is null.
+				if (kv.Value.IsNullOrEmpty())
+				{
+					// it's an encrypted setting value, and it's currently on the tenant side.
+					if (setting.IsEncrypted && CurrentTenant.IsAvailable)
+					{
+						// don't update.
+						continue;
+					}
+				}
+
 				await SetSettingAsync(setting, kv.Value); // todo: needs permission check?
 			}
 		}