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

提交

Browse Source
This commit is contained in:
lzw
2021-10-24 17:24:00 +08:00
parent ce21afb8e1
commit dd4a8aad51
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,8 +110,8 @@ namespace Yi.Framework.Service
} }
public async Task <List<menu>> GetMenuByUser(user _user) public async Task <List<menu>> GetMenuByUser(user _user)
{ {
//var user_data =await _Db.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus) var user_data = await _Db.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus)
// .Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); .Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
List<menu> menu_data = new (); List<menu> menu_data = new ();
foreach (var role in _user.roles) foreach (var role in _user.roles)
{ {
@@ -213,7 +213,7 @@ namespace Yi.Framework.Service
foreach(var item in roleList) foreach(var item in roleList)
{ {
item.menus.ToList().ForEach(u => u.roles = null); item.menus.ToList().ForEach(u => u.roles = null);
var menuData = item.menus.Where(u => u.router == router).FirstOrDefault(); var menuData = item.menus.Where(u => u.router.ToUpper() == router.ToUpper()).FirstOrDefault();
menu_data= menuData.children?.Where(u => menuIds.Contains(u.id)&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToList(); menu_data= menuData.children?.Where(u => menuIds.Contains(u.id)&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToList();
if (menu_data != null) { break; } if (menu_data != null) { break; }
} }

2
Yi.Vue/src/views/AdmMould.vue
View File

@@ -18,7 +18,7 @@ methods:{
init(){ init(){
userApi.GetRouterByUserId(this.$route.path).then(resp=>{ userApi.GetRouterByUserId(this.$route.path).then(resp=>{
this.axiosUrls=resp.data; this.axiosUrls=resp.data;
} })
} }
}, },
data: () => ({ data: () => ({