隐藏的菜单不显示

src/main/java/com/neotel/smfcore/security/rest/MenuController.java

@@ -78,8 +78,9 @@ public class MenuController {
         }
         String language= servletRequest.getLocale().getLanguage();
         List<Menu> menuList = menuManager.findByUserId(userId);
-        List<MenuDto> menuDtoList = menuMapper.toDto(menuManager.buildTree(menuList));
-        List<MenuVo> vos = menuManager.buildMenus(menuDtoList,language);
+        List<Menu> buildMenuList=menuManager.buildTree(menuList);
+//        List<MenuDto> menuDtoList = menuMapper.toDto(menuManager.buildTree(menuList));
+        List<MenuVo> vos = menuManager.buildMenus(buildMenuList,language);
         return new ResponseEntity<>(vos, HttpStatus.OK);
     }
 

src/main/java/com/neotel/smfcore/security/rest/bean/dto/MenuDto.java

@@ -78,11 +78,4 @@ public class MenuDto implements Serializable {
     public  String getPermission(){return  permission;}
 
 
-    public String GetMsgKey() {
-       String titleKey= (ObjectUtil.isNotEmpty(getTitleKey())? getTitleKey():getPath());
-       if(!titleKey.startsWith("smfcore.")){
-           titleKey="smfcore."+titleKey.trim();
-       }
-       return titleKey;
-    }
 }

src/main/java/com/neotel/smfcore/security/service/manager/IMenuManager.java

@@ -36,10 +36,10 @@ public interface IMenuManager extends IBaseManager<Menu> {
     List<Menu> buildTree(List<Menu> menuDtos);
     /**
      * 构建菜单树
-     * @param menuDtos /
+     * @param menus /
      * @return /
      */
-    List<MenuVo> buildMenus(List<MenuDto> menuDtos,String language);
+    List<MenuVo> buildMenus(List<Menu> menus,String language);
 
     /**
      * 懒加载菜单数据

src/main/java/com/neotel/smfcore/security/service/manager/impl/MenuManagerImpl.java

@@ -117,33 +117,34 @@ public class MenuManagerImpl implements IMenuManager {
     }
 
     @Override
-    public List<MenuVo> buildMenus(List<MenuDto> menuDtos,String language) {
+    public List<MenuVo> buildMenus(List<Menu> menuList,String language) {
 
         List<MenuVo> list=new LinkedList<>() ;
-        menuDtos.forEach(menuDto -> {
-            if(menuDto!=null && menuDto.getType()<=1){
-                List<MenuDto> menuDtoList=menuDto.getChildren();
+        menuList.forEach(menu -> {
+            if(menu!=null && menu.getType()<=1){
+
+                List<Menu> menuDtoList=menu.getChildren();
                 MenuVo menuVo=new MenuVo();
-                String oldName=ObjectUtil.isNotEmpty(menuDto.getComponentName())?menuDto.getComponentName():menuDto.getTitle();
-                String titleKey=menuDto.GetMsgKey();
+                String oldName=ObjectUtil.isNotEmpty(menu.getComponentName())?menu.getComponentName():menu.getTitle();
+                String titleKey=menu.GetMsgKey();
                 String title= MessageUtils.getText(titleKey, new Locale(language),oldName);
 //                log.info(titleKey+"="+title);
                 menuVo.setName(title);
-                boolean pidIsNull=(menuDto.getPid()==null)||(StringUtils.isBlank(menuDto.getPid())||menuDto.getPid().equals("0"));
+                boolean pidIsNull=(menu.getPid()==null)||(StringUtils.isBlank(menu.getPid())||menu.getPid().equals("0"));
                 // 一级目录需要加斜杠，不然会报警告
-                menuVo.setPath(pidIsNull?"/"+menuDto.getPath():menuDto.getPath());
-                menuVo.setHidden(menuDto.getHidden());
+                menuVo.setPath(pidIsNull?"/"+menu.getPath():menu.getPath());
+                menuVo.setHidden(menu.getHidden());
                 // 如果不是外链
-                if(!menuDto.getIFrame()){
+                if(!menu.getIFrame()){
                     if(pidIsNull){
-                        menuVo.setComponent(StringUtils.isEmpty(menuDto.getComponent())?"Layout":menuDto.getComponent());
-                    }else if(menuDto.getType()==0){
-                        menuVo.setComponent(StringUtils.isEmpty(menuDto.getComponent())?"ParentView":menuDto.getComponent());
-                    }else if(StringUtils.isNoneBlank(menuDto.getComponent())){
-                        menuVo.setComponent(menuDto.getComponent());
+                        menuVo.setComponent(StringUtils.isEmpty(menu.getComponent())?"Layout":menu.getComponent());
+                    }else if(menu.getType()==0){
+                        menuVo.setComponent(StringUtils.isEmpty(menu.getComponent())?"ParentView":menu.getComponent());
+                    }else if(StringUtils.isNoneBlank(menu.getComponent())){
+                        menuVo.setComponent(menu.getComponent());
                     }
                 }
-                menuVo.setMeta(new MenuMetaVo(title, menuDto.getIcon(),!menuDto.getCache()));
+                menuVo.setMeta(new MenuMetaVo(title, menu.getIcon(),!menu.getCache()));
                 if(CollectionUtil.isNotEmpty(menuDtoList)){
                     menuVo.setAlwaysShow(true);
                     menuVo.setRedirect("noredirect");
@@ -151,12 +152,12 @@ public class MenuManagerImpl implements IMenuManager {
                 }else if (pidIsNull) {
                     MenuVo menuVo1=new MenuVo();
                     menuVo1.setMeta(menuVo.getMeta());
-                    if(!menuDto.getIFrame()){
+                    if(!menu.getIFrame()){
                         menuVo1.setPath("index");
                         menuVo1.setName(menuVo.getName());
                         menuVo1.setComponent(menuVo.getComponent());
                     }else{
-                        menuVo1.setPath(menuDto.getPath());
+                        menuVo1.setPath(menu.getPath());
                     }
                     menuVo.setName(null);
                     menuVo.setMeta(null);
@@ -165,8 +166,13 @@ public class MenuManagerImpl implements IMenuManager {
                     list1.add(menuVo1);
                     menuVo.setChildren(list1);
                 }
+                if(menu.getHidden()){
+
+                }else{
                     list.add(menuVo);
                 }
+//                list.add(menuVo);
+            }
 
         });
          return list;

src/main/java/com/neotel/smfcore/security/service/po/Menu.java

@@ -15,6 +15,7 @@
  */
 package com.neotel.smfcore.security.service.po;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.base.BasePo;
 import lombok.*;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -168,4 +169,11 @@ public class Menu extends BasePo implements Serializable {
         Menu menu = new Menu(new ArrayList<Menu>(), 0, "", title, menuSort, path, "", "", subCount, false, false, false, title, icon,titleKey);
         return menu;
     }
+    public String GetMsgKey() {
+        String titleKey= (ObjectUtil.isNotEmpty(getTitleKey())? getTitleKey():getPath());
+        if(!titleKey.startsWith("smfcore.")){
+            titleKey="smfcore."+titleKey.trim();
+        }
+        return titleKey;
+    }
 }