lyhzzz 3 years ago
parent
commit
e785cedb17

+ 1 - 0
src/main/java/com/fdkankan/manage/controller/SysMenuController.java

@@ -66,6 +66,7 @@ public class SysMenuController extends BaseController{
     public ResultData getByUserId(){
         return ResultData.ok(menuService.getByUserId(getUserId()));
     }
+
     @GetMapping("/getButtonByUserId")
     public ResultData getButtonByUserId(){
         return ResultData.ok(menuService.getButtonByUserId(getUserId()));

+ 1 - 17
src/main/java/com/fdkankan/manage/service/impl/SysMenuServiceImpl.java

@@ -134,28 +134,12 @@ public class SysMenuServiceImpl extends ServiceImpl<ISysMenuMapper, SysMenu> imp
             vo.setMeta(meta);
 
             sysMenuVos.add(vo);
-            List<SysMenuVo> children = getByParentId(record.getId(),null,show,menuIds,null);
+            List<SysMenuVo> children = getByParentId(record.getId(),null,show,menuIds,notType);
             vo.setChildren(children);
         }
-        setChildrenNull(sysMenuVos);
         return sysMenuVos;
     }
 
-    /**
-     * 递归 将children为空设置为null
-     */
-    private void setChildrenNull(List<SysMenuVo> voList){
-        if(voList == null || voList.size() ==0){
-            return ;
-        }
-        for (SysMenuVo menuVo : voList) {
-            if(menuVo.getChildren()!=null && menuVo.getChildren().size() == 0 ) {
-                menuVo.setChildren(null);
-                continue ;
-            }
-             setChildrenNull(menuVo.getChildren());
-        }
-    }
 
     @Override
     public List<SysMenu> getButtonByUserId(Long userId) {