|
|
@ -55,38 +55,38 @@ namespace Tiobon.Core.AuthHelper |
|
|
|
var httpContext = _accessor.HttpContext; |
|
|
|
var httpContext = _accessor.HttpContext; |
|
|
|
|
|
|
|
|
|
|
|
// 获取系统中所有的角色和菜单的关系集合 |
|
|
|
// 获取系统中所有的角色和菜单的关系集合 |
|
|
|
if (!requirement.Permissions.Any()) |
|
|
|
//if (!requirement.Permissions.Any()) |
|
|
|
{ |
|
|
|
//{ |
|
|
|
var data = await _roleModulePermissionServices.RoleModuleMaps(); |
|
|
|
// var data = await _roleModulePermissionServices.RoleModuleMaps(); |
|
|
|
var list = new List<PermissionItem>(); |
|
|
|
// var list = new List<PermissionItem>(); |
|
|
|
// ids4和jwt切换 |
|
|
|
// // ids4和jwt切换 |
|
|
|
// ids4 |
|
|
|
// // ids4 |
|
|
|
if (Permissions.IsUseIds4) |
|
|
|
// if (Permissions.IsUseIds4) |
|
|
|
{ |
|
|
|
// { |
|
|
|
list = (from item in data |
|
|
|
// list = (from item in data |
|
|
|
where item.IsDeleted == false |
|
|
|
// where item.IsDeleted == false |
|
|
|
orderby item.Id |
|
|
|
// orderby item.Id |
|
|
|
select new PermissionItem |
|
|
|
// select new PermissionItem |
|
|
|
{ |
|
|
|
// { |
|
|
|
Url = item.Module?.LinkUrl, |
|
|
|
// Url = item.Module?.LinkUrl, |
|
|
|
Role = item.Role?.Id.ObjToString(), |
|
|
|
// Role = item.Role?.Id.ObjToString(), |
|
|
|
}).ToList(); |
|
|
|
// }).ToList(); |
|
|
|
} |
|
|
|
// } |
|
|
|
// jwt |
|
|
|
// // jwt |
|
|
|
else |
|
|
|
// else |
|
|
|
{ |
|
|
|
// { |
|
|
|
list = (from item in data |
|
|
|
// list = (from item in data |
|
|
|
where item.IsDeleted == false |
|
|
|
// where item.IsDeleted == false |
|
|
|
orderby item.Id |
|
|
|
// orderby item.Id |
|
|
|
select new PermissionItem |
|
|
|
// select new PermissionItem |
|
|
|
{ |
|
|
|
// { |
|
|
|
Url = item.Module?.LinkUrl, |
|
|
|
// Url = item.Module?.LinkUrl, |
|
|
|
Role = item.Role?.Name.ObjToString(), |
|
|
|
// Role = item.Role?.Name.ObjToString(), |
|
|
|
}).ToList(); |
|
|
|
// }).ToList(); |
|
|
|
} |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
requirement.Permissions = list; |
|
|
|
// requirement.Permissions = list; |
|
|
|
} |
|
|
|
//} |
|
|
|
|
|
|
|
|
|
|
|
if (httpContext != null) |
|
|
|
if (httpContext != null) |
|
|
|
{ |
|
|
|
{ |
|
|
|