admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
pengjie 2023-11-08 11:48:42 +08:00
parent 22f288a860
commit 18b2952a97
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
View File

@ -218,6 +218,8 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
} else { } else {
moduleId = 1670603312504918018L; 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<>(); Set<BaseMenu> baseMenus = new HashSet<>();
List<BaseMenu> baseMenuList = new ArrayList<>(); List<BaseMenu> baseMenuList = new ArrayList<>();
if (accountType != 3) { if (accountType != 3) {
@ -244,7 +246,8 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
} }
} }
baseMenuList.addAll(baseMenus); 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 @Override