zhusenlin/Yi.Admin
1
0
Fork 0
mirror of https://gitee.com/ccnetcore/Yi synced 2026-03-19 16:06:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into ec

Browse Source
This commit is contained in:
橙子
2021-11-09 17:05:59 +08:00
parent f6ab793450 6d5f2cbae7
commit dd83ea384e
9 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Framework/Yi.Framework.Service/MenuService.cs
View File

@@ -59,7 +59,7 @@ namespace Yi.Framework.Service
public async Task<List<menu>> GetTopMenuByUserId(int userId)
{
var user_data = await _DbRead.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus).FirstOrDefaultAsync();
var user_data = await _DbRead.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus).Where(u=>u.id==userId).FirstOrDefaultAsync();
List<menu> menuList = new();
user_data.roles.ForEach(u =>
{

3
Yi.Framework/Yi.Framework.Service/RoleService.cs
View File

@@ -16,7 +16,8 @@ namespace Yi.Framework.Service
public async Task<List<role>> GetRolesByUserId(int userId)
{
var user_data =await _Db.Set<user>().Include(u => u.roles).Where(u => u.id==userId).FirstOrDefaultAsync();
var roleList = user_data.roles.Where(u=>u.is_delete==Normal).ToList();
var roleList = user_data.roles.Where(u=>u.is_delete==Normal).ToList();
roleList.ForEach(u => u.users = null);
return roleList;
}