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

修改菜单模式

Browse Source
This commit is contained in:
橙子
2021-10-23 20:23:44 +08:00
parent 26495a974d
commit 0cc6604c84
6 changed files with 50 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Yi.Framework/Yi.Framework.Service/UserService.cs
View File

@@ -145,23 +145,25 @@ namespace Yi.Framework.Service
{
var menu = await _roleService.GetMenusByRole(role);
menu.ForEach(u => u.roles = null);
menu_data = menu_data.Concat(menu).OrderByDescending(u => u.sort).ToList();
menu_data = menu_data.Union(menu).OrderByDescending(u => u.sort).ToList();
}
return TopMenuBuild(menu_data);
return TopMenuBuild2(TopMenuBuild(menu_data));
}
private List<menu> TopMenuBuild(List<menu> menu_data)
{
for (int i = menu_data.Count() - 1; i >= 0; i--)
{
if (menu_data[i].is_delete == (short)Common.Enum.DelFlagEnum.Deleted|| menu_data[i].is_delete == (short)Common.Enum.ShowFlagEnum.NoShow)
if (menu_data[i].icon == null)
{
menu_data[i].icon = "Yi";
}
if (menu_data[i].is_delete == (short)Common.Enum.DelFlagEnum.Deleted|| menu_data[i].is_show == (short)Common.Enum.ShowFlagEnum.NoShow)
{
menu_data.Remove(menu_data[i]);
}
else if (menu_data[i].children == null)
{
menu_data[i].children =null;
}
else if (menu_data[i].children != null)
{
menu_data[i].children = TopMenuBuild(menu_data[i].children.ToList());
@@ -169,6 +171,26 @@ namespace Yi.Framework.Service
}
return menu_data;
}
private List<menu> TopMenuBuild2(List<menu> menu_data)
{
for (int i = menu_data.Count() - 1; i >= 0; i--)
{
if (menu_data[i].children.Count() == 0)
{
menu_data[i].children = null;
}
else if (menu_data[i].children != null)
{
menu_data[i].children = TopMenuBuild2(menu_data[i].children.ToList());
}
}
return menu_data;
}
public async Task<menu> GetMenuByUserId(string router)
{
return await _Db.Set<menu>().Include(u => u.children).ThenInclude(u => u.mould)