From 07a74c83d81c5fa5c8e43c7ad64ace5563b9f9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sun, 24 Oct 2021 19:36:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E7=BB=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Yi.Framework/Yi.Framework.Service/MenuService.cs | 3 +-- Yi.Framework/Yi.Framework.Service/UserService.cs | 2 +- Yi.Vue/src/views/AdmMould.vue | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Yi.Framework/Yi.Framework.Service/MenuService.cs b/Yi.Framework/Yi.Framework.Service/MenuService.cs index 00bb42f1..7f0ccbe1 100644 --- a/Yi.Framework/Yi.Framework.Service/MenuService.cs +++ b/Yi.Framework/Yi.Framework.Service/MenuService.cs @@ -72,8 +72,7 @@ namespace Yi.Framework.Service public async Task> GetTopMenu() { - var menu_data= await _Db.Set().Include(u=>u.mould).Include(u => u.children) - .ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children) + var menu_data= await _Db.Set().Include(u=>u.mould).Include(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children) .Where(u =>u.is_delete == (short)Common.Enum.DelFlagEnum.Normal && u.is_top == (short)Common.Enum.ShowFlagEnum.Show) .ToListAsync(); return TopMenuBuild(menu_data); diff --git a/Yi.Framework/Yi.Framework.Service/UserService.cs b/Yi.Framework/Yi.Framework.Service/UserService.cs index c76c1be9..e1f05067 100644 --- a/Yi.Framework/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework/Yi.Framework.Service/UserService.cs @@ -113,7 +113,7 @@ namespace Yi.Framework.Service 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) + foreach (var role in user_data.roles) { var menu = role.menus.ToList(); menu.ForEach(u=>u.roles=null); diff --git a/Yi.Vue/src/views/AdmMould.vue b/Yi.Vue/src/views/AdmMould.vue index b08bfafc..ac544735 100644 --- a/Yi.Vue/src/views/AdmMould.vue +++ b/Yi.Vue/src/views/AdmMould.vue @@ -31,8 +31,8 @@ methods:{ { text: "操作", value: "actions", sortable: false }, ], defaultItem: { - mould_name: "test", - url: "test/test", + mould_name: "get", + url: "/get/gettest", }, }), };