Merge branch 'dyf-device' into 6170

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/SystemConstants.java

@@ -77,4 +77,9 @@ public interface SystemConstants {
      */
     String ROOT_DEPT_ANCESTORS = "0";
 
+    /**
+     * 菜单ID
+     */
+    public static final Long RESTRICTED_MENU_ID = 102L;
+
 }

fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysMenuController.java

@@ -36,6 +36,7 @@ public class SysMenuController extends BaseController {
 
     private final ISysMenuService menuService;
 
+
     /**
      * 获取路由信息
      *
@@ -47,6 +48,7 @@ public class SysMenuController extends BaseController {
         return R.ok(menuService.buildMenus(menus));
     }
 
+
     /**
      * 获取菜单列表
      */

fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysMenuServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 菜单 业务层处理
@@ -141,10 +142,17 @@ public class SysMenuServiceImpl implements ISysMenuService {
             menus = baseMapper.selectMenuTreeAll();
         } else {
             menus = baseMapper.selectMenuTreeByUserId(userId);
+            // 如果不是超级管理员且不是租户管理员，则过滤掉受限制的菜单
+            // if (!LoginHelper.isAdmin()) {
+            menus = menus.stream()
+                    .filter(menu -> !SystemConstants.RESTRICTED_MENU_ID.equals(menu.getMenuId()))
+                    .collect(Collectors.toList());
+            // }
         }
         return getChildPerms(menus, 0);
     }
 
+
     /**
      * 根据角色ID查询菜单树信息
      *