Merge pull request #1137 from mehmetuken/patch-2

Check entity has a tenant id value.

framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs

@@ -91,7 +91,7 @@ namespace Volo.Abp.Application.Services
 
             var entity = MapToEntity(input);
             
-            if(entity is IMultiTenant)
+            if(entity is IMultiTenant && !HasTenantIdProperty(entity))
             {
                 TryToSetTenantId(entity);
             }

framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs

@@ -88,7 +88,7 @@ namespace Volo.Abp.Application.Services
 
             var entity = MapToEntity(input);
             
-            if(entity is IMultiTenant)
+            if(entity is IMultiTenant && !HasTenantIdProperty(entity))
             {
                 TryToSetTenantId(entity);
             }

framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs

@@ -156,7 +156,7 @@ namespace Volo.Abp.Application.Services
         {
             var tenantId = CurrentTenant.Id;
 
-            if (tenantId == null)
+            if (!tenantId.HasValue)
             {
                 return;
             }
@@ -168,5 +168,10 @@ namespace Volo.Abp.Application.Services
                 propertyInfo.SetValue(entity, tenantId, null);
             }
         }
+
+        protected virtual bool HasTenantIdProperty(TEntity entity)
+        {
+            return entity.GetType().GetProperty(nameof(IMultiTenant.TenantId)) != null;
+        }
     }
 }