lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-07-15 14:04:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #IADLX5 为角色分配按钮权限不起作用。

Browse Source
This commit is contained in:
wintel 2024-07-18 21:52:02 +08:00
parent c8db5cb0b0
commit 4938027aa5
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenAuth.App/AuthStrategies/NormalAuthStrategy.cs
View File

@ -44,8 +44,10 @@ namespace OpenAuth.App
var moduleIds = SugarClient.Queryable<Relevance>().Where( var moduleIds = SugarClient.Queryable<Relevance>().Where(
u => u =>
(u.Key == Define.ROLEMODULE && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList(); (u.Key == Define.ROLEMODULE && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
var elementIds = GetElementIds();
return SugarClient.Queryable<ModuleView>().Where(m =>moduleIds.Contains(m.Id)).Includes(x=>x.Elements).ToList(); return SugarClient.Queryable<ModuleView>().Where(m =>moduleIds.Contains(m.Id))
.Includes(x=>x.Elements.Where(u=>elementIds.Contains(u.Id)).ToList()).ToList();
} }
} }
@ -54,14 +56,24 @@ namespace OpenAuth.App
{ {
get get
{ {
var elementIds = SugarClient.Queryable<Relevance>().Where( var elementIds = GetElementIds();
u =>
(u.Key == Define.ROLEELEMENT && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
var usermoduleelements = SugarClient.Queryable<ModuleElement>().Where(u => elementIds.Contains(u.Id)); var usermoduleelements = SugarClient.Queryable<ModuleElement>().Where(u => elementIds.Contains(u.Id));
return usermoduleelements.ToList(); return usermoduleelements.ToList();
} }
} }
/// <summary>
/// 获取角色可访问的菜单Id
/// </summary>
/// <returns></returns>
private List<string> GetElementIds()
{
var elementIds = SugarClient.Queryable<Relevance>().Where(
u =>
(u.Key == Define.ROLEELEMENT && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
return elementIds;
}
public List<Role> Roles public List<Role> Roles
{ {
get { return SugarClient.Queryable<Role>().Where(u => _userRoleIds.Contains(u.Id)).ToList(); } get { return SugarClient.Queryable<Role>().Where(u => _userRoleIds.Contains(u.Id)).ToList(); }