|
@@ -120,29 +120,29 @@ public class SettingsService {
|
|
|
return ResultVoUtil.success();
|
|
|
}
|
|
|
|
|
|
- public ResultVo<List<MenuTree>> getAllMenus() {
|
|
|
- List<MenuTree> tree = new ArrayList<>();
|
|
|
- List<MenuTree> topLevelMenus = dao.getMenusByParent(0);
|
|
|
- for (MenuTree topLevel : topLevelMenus) {
|
|
|
- List<MenuTree> secondLevelMenus = dao.getMenusByParent(topLevel.getCode());
|
|
|
+ public ResultVo<List<MenuItem>> getAllMenus() {
|
|
|
+ List<MenuItem> tree = new ArrayList<>();
|
|
|
+ List<MenuItem> topLevelMenus = dao.getMenusByParent(0);
|
|
|
+ for (MenuItem topLevel : topLevelMenus) {
|
|
|
+ List<MenuItem> secondLevelMenus = dao.getMenusByParent(topLevel.getCode());
|
|
|
if (null == secondLevelMenus || secondLevelMenus.isEmpty()) {
|
|
|
continue;
|
|
|
}
|
|
|
- for (MenuTree second : secondLevelMenus) {
|
|
|
- List<MenuTree> thirdLevelMenus = dao.getMenusByParent(second.getCode());
|
|
|
+ for (MenuItem second : secondLevelMenus) {
|
|
|
+ List<MenuItem> thirdLevelMenus = dao.getMenusByParent(second.getCode());
|
|
|
if (null == thirdLevelMenus || thirdLevelMenus.isEmpty()) {
|
|
|
continue;
|
|
|
}
|
|
|
- for (MenuTree third : thirdLevelMenus) {
|
|
|
- List<MenuTree> forthLevelMenus = dao.getMenusByParent(third.getCode());
|
|
|
+ for (MenuItem third : thirdLevelMenus) {
|
|
|
+ List<MenuItem> forthLevelMenus = dao.getMenusByParent(third.getCode());
|
|
|
if (null == forthLevelMenus || forthLevelMenus.isEmpty()) {
|
|
|
continue;
|
|
|
}
|
|
|
- third.setMenus(forthLevelMenus);
|
|
|
+ third.setChildren(forthLevelMenus);
|
|
|
}
|
|
|
- second.setMenus(thirdLevelMenus);
|
|
|
+ second.setChildren(thirdLevelMenus);
|
|
|
}
|
|
|
- topLevel.setMenus(secondLevelMenus);
|
|
|
+ topLevel.setChildren(secondLevelMenus);
|
|
|
tree.add(topLevel);
|
|
|
}
|
|
|
return ResultVoUtil.success(tree);
|