Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into net6.0

Browse Source
This commit is contained in:
不做码农
2022-05-25 09:42:01 +08:00
parent 82a60439a9 bdf46a6036
commit e527e2fa59
9 changed files with 130 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
View File

@@ -54,18 +54,30 @@ namespace ZR.Admin.WebApi.Controllers.System
return SUCCESS(sysMenuService.GetMenuByMenuId(menuId), "yyyy-MM-dd HH:mm:ss");
}
/// <summary>
/// 获取菜单下拉树列表(分配角色所需菜单)
/// </summary>
/// <returns></returns>
[HttpGet("treeSelect")]
public IActionResult TreeSelect()
{
long userId = HttpContext.GetUId();
var list = sysMenuService.SelectMenuList(new MenuQueryDto(), userId).FindAll(f => f.visible == "0");
var treeMenus = sysMenuService.BuildMenuTreeSelect(list);
///// <summary>
///// 获取菜单下拉树列表(分配角色所需菜单)
///// </summary>
///// <returns></returns>
//[HttpGet("treeSelect")]
//public IActionResult TreeSelect()
//{
// long userId = HttpContext.GetUId();
// var list = sysMenuService.SelectMenuList(new MenuQueryDto(), userId).FindAll(f => f.visible == "0");
// var treeMenus = sysMenuService.BuildMenuTreeSelect(list);
return SUCCESS(treeMenus);
// return SUCCESS(treeMenus);
//}
/// <summary>
/// 根据菜单编号获取菜单列表，菜单管理首次进入
/// </summary>
/// <param name="menuId"></param>
/// <returns></returns>
[HttpGet("list/{menuId}")]
[ActionPermissionFilter(Permission = "system:menu:query")]
public IActionResult GetMenuList(int menuId = 0)
{
return SUCCESS(sysMenuService.GetMenusByMenuId(menuId), "yyyy-MM-dd HH:mm:ss");
}
/// <summary>