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

Merge branch 'main' of https://github.com/ccnetcore/Yi

Browse Source
This commit is contained in:
橙子
2021-10-22 19:59:36 +08:00
parent d136d88d1d 7f4d0df815
commit 53aefeaedd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,11 +50,11 @@ namespace Yi.Framework.Service
role_data.ForEach(u => role_data.ForEach(u =>
{ {
var menu_data = _roleService.GetMenusByRole(u); var menu_data = _roleService.GetMenusByRole(u);
menuList = menuList.Concat((IEnumerable<menu>)menu_data).ToList(); menuList = menuList.Concat(menu_data.GetAwaiter().GetResult()).ToList();
}); });
//menuList.ForEach(u => u.roles = null); menuList.ForEach(u => u.roles = null);
return (List<menu>)menuList; return menuList;
} }
public async Task<List<mould>> GetMouldByUser(user _user) public async Task<List<mould>> GetMouldByUser(user _user)