Browse Source

Updates

pull/952/head
ddrsql 7 years ago
parent
commit
f4e4380bfd
  1. 2
      framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs
  2. 2
      framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs

2
framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs

@ -20,7 +20,7 @@ namespace Volo.Abp.Authorization.Permissions
public override async Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context) public override async Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
{ {
var userId = CurrentUser.Id.ToString(); var userId = CurrentUser.Id?.ToString();
if (userId == null) if (userId == null)
{ {

2
framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs

@ -18,7 +18,7 @@ namespace Volo.Abp.MultiTenancy
} }
context.Handled = true; context.Handled = true;
context.TenantIdOrName = currentUser.TenantId.ToString(); context.TenantIdOrName = currentUser.TenantId?.ToString();
} }
} }
} }
Loading…
Cancel
Save