add

医院新增默认菜单

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/service/CurrentUserService.java

@@ -84,10 +84,17 @@ public class CurrentUserService {
         }else {
             tenantMenus=roleMenus;
         }
+        //菜单加按钮
+
+        List<SysMenuDTO> pageMenuList = tenantMenus
+                .stream()
+                .filter(menu -> !StrUtil.equals(MenuEnum.button.name(), menu.getMenuType()))
+                .filter(menu -> Boolean.TRUE.equals(menu.getVisible()))
+                .collect(Collectors.toList());
+
         Collection<SysMenuDTO> allMenus = CollectionUtil.intersection(tenantMenus, roleMenus);
-        if(CollectionUtil.isEmpty(allMenus)){
-            return new ArrayList<>();
-        }
+        allMenus.addAll(pageMenuList);
+        //所有的页面和菜单按钮分离
         return allMenus
                 .stream()
                 .collect(Collectors.groupingBy(SysMenuDTO::getId, Collectors.collectingAndThen(Collectors.toList(), CollUtil::getFirst)))
@@ -95,7 +102,7 @@ public class CurrentUserService {
                 .values()
                 .stream()
                 .filter(menu -> !StrUtil.equals(MenuEnum.button.name(), menu.getMenuType()))
-//                .filter(menu-> Boolean.TRUE.equals(menu.getVisible()))
+                .filter(menu-> Boolean.TRUE.equals(menu.getVisible()))
                 .map(menuService::convertToRoute)
                 .collect(Collectors.toList());
     }