xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(rbac): 角色菜单树接口增加菜单来源参数

Browse Source
This commit is contained in:
wcg
2026-01-27 18:11:52 +08:00
parent 960d8a309c
commit 9afeb59766
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs
View File

@@ -227,12 +227,12 @@ namespace Yi.Framework.Rbac.Application.Services.System
/// </summary>
/// <param name="roleId"></param>
/// <returns></returns>
public async Task<ActionResult> GetMenuTreeAsync(Guid roleId)
public async Task<ActionResult> GetMenuTreeAsync(Guid roleId, MenuSourceEnum menuSource = MenuSourceEnum.Vben5)
{
var checkedKeys = await _menuRepository._DbQueryable
.Where(m => SqlFunc.Subqueryable<RoleMenuEntity>().Where(rm => rm.RoleId == roleId && rm.MenuId == m.Id).Any())
.Select(x => x.Id).ToListAsync();
var menus = await _menuRepository._DbQueryable.ToListAsync();
var menus = await _menuRepository._DbQueryable.Where(x => x.State == true && x.MenuSource == menuSource).ToListAsync();
var menuTrees = menus.TreeDtoBuild();
return new JsonResult(new
{