Merge branch 'main' into ec

This commit is contained in:
橙子
2021-11-09 17:05:59 +08:00
9 changed files with 74 additions and 11 deletions

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 =>
{