Merge branch 'master' into net6.0

2022-05-30 09:30:38 +08:00
parent c759d1bccb f5f0de7716
commit ea7b5579d1
4 changed files with 8 additions and 29 deletions
--- a/ZR.Service/System/SysMenuService.cs
+++ b/ZR.Service/System/SysMenuService.cs
@@ -170,7 +170,6 @@ namespace ZR.Service
        public List<SysMenu> SelectMenuTreeByUserId(long userId)
        {
            MenuQueryDto dto = new() { Status = "0", MenuTypeIds = "M,C" };
-            //List<SysMenu> menus;
            if (SysRoleService.IsAdmin(userId))
            {
                return MenuRepository.SelectTreeMenuList(dto);
@@ -178,10 +177,8 @@ namespace ZR.Service
            else
            {
                List<long> roleIds = SysRoleService.SelectUserRoles(userId);
-                //menus = MenuRepository.SelectMenuTreeByRoleIds(roleIds);
                return MenuRepository.SelectTreeMenuListByRoles(dto, roleIds);
            }
-            //return GetChildPerms(menus, 0);
        }

        /// <summary>