diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java index 6837432..f3eb275 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java @@ -218,6 +218,8 @@ public class BaseMenuServiceImpl extends ServiceImpl i } else { moduleId = 1670603312504918018L; } + List baseModules = baseModuleService.list(Wrappers.lambdaQuery().eq(BaseModule::getModuleId, moduleId)); + List menuList = TreeUtil.formatModule(baseModules); Set baseMenus = new HashSet<>(); List baseMenuList = new ArrayList<>(); if (accountType != 3) { @@ -244,7 +246,8 @@ public class BaseMenuServiceImpl extends ServiceImpl 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