diff --git a/Yi.Framework/Yi.Framework.Service/UserService.cs b/Yi.Framework/Yi.Framework.Service/UserService.cs index c7f828dc..c76c1be9 100644 --- a/Yi.Framework/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework/Yi.Framework.Service/UserService.cs @@ -110,8 +110,8 @@ namespace Yi.Framework.Service } public async Task > GetMenuByUser(user _user) { - //var user_data =await _Db.Set().Include(u => u.roles).ThenInclude(u => u.menus) - // .Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); + var user_data = await _Db.Set().Include(u => u.roles).ThenInclude(u => u.menus) + .Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); List menu_data = new (); foreach (var role in _user.roles) { @@ -213,7 +213,7 @@ namespace Yi.Framework.Service foreach(var item in roleList) { 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(); if (menu_data != null) { break; } } diff --git a/Yi.Vue/src/views/AdmMould.vue b/Yi.Vue/src/views/AdmMould.vue index 3b451179..b08bfafc 100644 --- a/Yi.Vue/src/views/AdmMould.vue +++ b/Yi.Vue/src/views/AdmMould.vue @@ -18,7 +18,7 @@ methods:{ init(){ userApi.GetRouterByUserId(this.$route.path).then(resp=>{ this.axiosUrls=resp.data; - } + }) } }, data: () => ({