From 1eecea001b8a51933ee5d50c61c1be0778a79335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 12 Apr 2023 22:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Service/System/SysMenuService.cs | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs
index 18763e7..27d6cb9 100644
--- a/ZR.Service/System/SysMenuService.cs
+++ b/ZR.Service/System/SysMenuService.cs
@@ -32,16 +32,17 @@ namespace ZR.Service
         public List<SysMenu> SelectTreeMenuList(MenuQueryDto menu, long userId)
         {
             List<SysMenu> menuList;
-            if (SysRoleService.IsAdmin(userId))
-            {
-                menuList = SelectTreeMenuList(menu);
-            }
-            else
-            {
-                var userRoles = SysRoleService.SelectUserRoles(userId);
-                menuList = SelectTreeMenuListByRoles(menu, userRoles);
-            }
-            return menuList ?? new List<SysMenu>();
+            //if (SysRoleService.IsAdmin(userId))
+            //{
+            //    menuList = SelectTreeMenuList(menu);
+            //}
+            //else
+            //{
+            //    var userRoles = SysRoleService.SelectUserRoles(userId);
+            //    menuList = SelectTreeMenuListByRoles(menu, userRoles);
+            //}
+            menuList = BuildMenuTree(SelectMenuList(menu, userId));
+            return menuList;
         }
 
         /// <summary>
@@ -53,7 +54,7 @@ namespace ZR.Service
             List<SysMenu> menuList;
             if (SysRoleService.IsAdmin(userId))
             {
-                menuList = SelectAllMenuList(menu);
+                menuList = SelectMenuList(menu);
             }
             else
             {
@@ -238,12 +239,13 @@ namespace ZR.Service
         /// 获取所有菜单
         /// </summary>
         /// <returns></returns>
-        private List<SysMenu> SelectAllMenuList(MenuQueryDto menu)
+        private List<SysMenu> SelectMenuList(MenuQueryDto menu)
         {
             return Queryable()
                 .WhereIF(!string.IsNullOrEmpty(menu.MenuName), it => it.MenuName.Contains(menu.MenuName))
                 .WhereIF(!string.IsNullOrEmpty(menu.Visible), it => it.Visible == menu.Visible)
                 .WhereIF(!string.IsNullOrEmpty(menu.Status), it => it.Status == menu.Status)
+                .WhereIF(!string.IsNullOrEmpty(menu.MenuTypeIds), it => menu.MenuTypeIdArr.Contains(it.MenuType))
                 .WhereIF(menu.ParentId != null, it => it.ParentId == menu.ParentId)
                 .OrderBy(it => new { it.ParentId, it.OrderNum })
                 .ToList();
@@ -411,7 +413,7 @@ namespace ZR.Service
         /// <returns>下拉树结构列表</returns>
         public List<SysMenu> BuildMenuTree(List<SysMenu> menus)
         {
-            List<SysMenu> returnList = new List<SysMenu>();
+            List<SysMenu> returnList = new();
             List<long> tempList = menus.Select(f => f.MenuId).ToList();
 
             foreach (var menu in menus)