This commit is contained in:
pengjie 2023-11-08 11:48:42 +08:00
parent 22f288a860
commit 18b2952a97

View File

@ -218,6 +218,8 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
} else {
moduleId = 1670603312504918018L;
}
List<BaseModule> baseModules = baseModuleService.list(Wrappers.<BaseModule>lambdaQuery().eq(BaseModule::getModuleId, moduleId));
List<MenuTreeDto> menuList = TreeUtil.formatModule(baseModules);
Set<BaseMenu> baseMenus = new HashSet<>();
List<BaseMenu> baseMenuList = new ArrayList<>();
if (accountType != 3) {
@ -244,7 +246,8 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
}
}
baseMenuList.addAll(baseMenus);
return TreeUtil.build(TreeUtil.formatMenu(baseMenuList), 1, moduleId, 2);
menuList.addAll(TreeUtil.formatMenu(baseMenuList));
return TreeUtil.build(menuList, 0, moduleId, 1);
}
@Override