From f4e4380bfd338cdc8ac068e9c3c3bc80be9709a4 Mon Sep 17 00:00:00 2001 From: ddrsql Date: Wed, 10 Apr 2019 10:24:46 +0800 Subject: [PATCH] Updates --- .../Authorization/Permissions/UserPermissionValueProvider.cs | 2 +- .../CurrentClaimsPrincipalTenantResolveContributor.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs index f9a6ca903e..9203467a5a 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.Authorization.Permissions public override async Task CheckAsync(PermissionValueCheckContext context) { - var userId = CurrentUser.Id.ToString(); + var userId = CurrentUser.Id?.ToString(); if (userId == null) { diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs index c2e28d1222..61e49cea81 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs @@ -18,7 +18,7 @@ namespace Volo.Abp.MultiTenancy } context.Handled = true; - context.TenantIdOrName = currentUser.TenantId.ToString(); + context.TenantIdOrName = currentUser.TenantId?.ToString(); } } } \ No newline at end of file