From ec5982a6e3c6c359f11497a483ac54dbb68946bb Mon Sep 17 00:00:00 2001
From: lzw <605106923@qq.com>
Date: Sat, 30 Oct 2021 00:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Framework/Yi.Framework.Service/MenuService.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Yi.Framework/Yi.Framework.Service/MenuService.cs b/Yi.Framework/Yi.Framework.Service/MenuService.cs
index 99210c3d..e2825cd6 100644
--- a/Yi.Framework/Yi.Framework.Service/MenuService.cs
+++ b/Yi.Framework/Yi.Framework.Service/MenuService.cs
@@ -41,7 +41,7 @@ namespace Yi.Framework.Service
          return TopMenuBuild(menu_data); 
         }
 
-        public async Task<List<menu>> GetTopMenusByHttpUser(List<int> menuIds)
+        public async Task<List<menu>> GetTopMenusByTopMenuIds(List<int> menuIds)
         {
            return await _DbRead.Set<menu>().Where(u => menuIds.Contains(u.id)).ToListAsync();
         }
@@ -77,7 +77,14 @@ namespace Yi.Framework.Service
         }
         public async Task<List<menu>> GetTopMenuByUserId(int userId)
         {
-            throw new Exception();
+            var user_data = await _DbRead.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus).FirstOrDefaultAsync();
+            List<menu> menuList = new();
+            user_data.roles.ForEach(u =>
+            {
+                var m = u.menus.Where(u => u.is_delete == Normal).ToList();
+                menuList = menuList.Union(m).ToList();
+            });
+            return menuList;
         }
 
     }