|
@@ -158,17 +158,27 @@ public class SysMenuServiceImpl extends ServiceImpl<ISysMenuMapper, SysMenu> imp
|
|
if(sysMenu.getParentId() !=null){
|
|
if(sysMenu.getParentId() !=null){
|
|
SysMenuVo menuVo = voMap.get(sysMenu.getId());
|
|
SysMenuVo menuVo = voMap.get(sysMenu.getId());
|
|
List<SysMenuVo> children = voMap.get(sysMenu.getParentId()).getChildren();
|
|
List<SysMenuVo> children = voMap.get(sysMenu.getParentId()).getChildren();
|
|
- if(children == null){
|
|
|
|
- children = new ArrayList<>();
|
|
|
|
- }
|
|
|
|
children.add(menuVo);
|
|
children.add(menuVo);
|
|
- menuVo.setChildren(children);
|
|
|
|
}else {
|
|
}else {
|
|
voList.add(voMap.get(sysMenu.getId()));
|
|
voList.add(voMap.get(sysMenu.getId()));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ setChildrenNull(voList);
|
|
return voList;
|
|
return voList;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ 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());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
}
|
|
}
|