Check entity has a tenant id value.

7 years ago · 1103ed2a26
1 changed files with 6 additions and 1 deletions
--- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs
+++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs
@ -154,9 +154,14 @@ namespace Volo.Abp.Application.Services
        
        protected virtual void TryToSetTenantId(TEntity entity)
        {
+            if (entity is IMultiTenant tenantEntity && tenantEntity.TenantId.HasValue)
+            {
+                return;
+            }
+            
            var tenantId = CurrentTenant.Id;

-            if (tenantId == null)
+            if (!tenantId.HasValue)
            {
                return;
            }