zhusenlin/Yi.Admin
1
0
Fork 0
mirror of https://gitee.com/ccnetcore/Yi synced 2026-04-01 22:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

完成上传头像和excel导出

Browse Source
This commit is contained in:
lzw
2021-11-02 23:22:37 +08:00
parent 543e656633
commit e157a63204
19 changed files with 353 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,14 +37,13 @@ namespace Yi.Framework.Service
.Include(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.mould)
.Include(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.mould)
.Where(u =>u.is_delete == Normal && u.is_show == (short)Common.Enum.ShowFlagEnum.Show && u.is_top == (short)Common.Enum.TopFlagEnum.Top)
.OrderByDescending(u=>u.sort)
.FirstOrDefaultAsync();
return TreeMenuBuild.Normal(menu_data);
return TreeMenuBuild.Sort(TreeMenuBuild.Normal(menu_data));
}
public async Task<List<menu>> GetTopMenusByTopMenuIds(List<int> menuIds)
{
return await _DbRead.Set<menu>().AsNoTracking().Where(u => menuIds.Contains(u.id)).ToListAsync();
return await _DbRead.Set<menu>().AsNoTracking().Where(u => menuIds.Contains(u.id)).OrderBy(u=>u.sort).ToListAsync();
}
public async Task<menu> SetMouldByMenu(int id1,int id2)

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

@@ -55,28 +55,12 @@ namespace Yi.Framework.Service
return menuList;
}
public async Task<menu> GetMenuByHttpUser(int userId)
public async Task<menu> GetMenuByHttpUser(List<int> allMenuIds)
{
var user_data = await GetUserById(userId);
List<menu> menuList = new();
foreach (var item in user_data.roles)
{
var m = item.menus.Where(u => u.is_delete == Normal).ToList();
menuList = menuList.Union(m).OrderByDescending(u => u.sort).ToList();
}
//menu_data为角色所有的菜单，不是一个递归的啊
var allMenuIds = menuList.Select(u => u.id).ToList();
var topMenu =await _DbRead.Set<menu>().Include(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).Where(u => u.is_top == (short)Common.Enum.ShowFlagEnum.Show).FirstOrDefaultAsync();
var topMenu =await _DbRead.Set<menu>().Include(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).Where(u => u.is_top == (short)Common.Enum.ShowFlagEnum.Show).FirstOrDefaultAsync();
//现在要开始关联菜单了
return TreeMenuBuild.Sort(TreeMenuBuild.ShowFormat(topMenu, allMenuIds)); ;
}
}
public async Task<user> GetUserInRolesByHttpUser(int userId)
{
return await GetUserById(userId);