|
|
@ -140,11 +140,6 @@ namespace Volo.Abp.Identity.EntityFrameworkCore |
|
|
Guid? organizationUnitId = null, |
|
|
Guid? organizationUnitId = null, |
|
|
CancellationToken cancellationToken = default) |
|
|
CancellationToken cancellationToken = default) |
|
|
{ |
|
|
{ |
|
|
if(roleId.HasValue || organizationUnitId.HasValue) |
|
|
|
|
|
{ |
|
|
|
|
|
includeDetails = true; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return await (await GetDbSetAsync()) |
|
|
return await (await GetDbSetAsync()) |
|
|
.IncludeDetails(includeDetails) |
|
|
.IncludeDetails(includeDetails) |
|
|
.WhereIf( |
|
|
.WhereIf( |
|
|
|