From 18b2952a970deab634619e9dab2743dd9bf00bb1 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Wed, 8 Nov 2023 11:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/basicdata/service/impl/BaseMenuServiceImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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<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