dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 菜单管理bug

Browse Source
This commit is contained in:
fit2cloud-chenyw 2021-05-21 10:36:06 +08:00
parent 9721a406dc
commit 834e6a7f48
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.xml
View File

@ -8,13 +8,14 @@
</resultMap>
<select id="allNodes" resultMap="simpleNode">
select menu_id as id, pid from sys_menu
select menu_id as id, pid from sys_menu where hidden != 1
</select>
<select id="nodesByExample" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="simpleNode">
select menu_id as id, pid from sys_menu
<include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
and hidden != 1
</select>

2
backend/src/main/java/io/dataease/service/sys/MenuService.java
View File

@ -157,7 +157,7 @@ public class MenuService {
private MenuTreeNode format(SysMenu sysMenu) {
MenuTreeNode menuTreeNode = new MenuTreeNode();
menuTreeNode.setId(sysMenu.getMenuId());
menuTreeNode.setLabel(sysMenu.getName());
menuTreeNode.setLabel(sysMenu.getTitle());
menuTreeNode.setHasChildren(false);
Optional.ofNullable(sysMenu.getMenuSort()).ifPresent(num -> menuTreeNode.setHasChildren(num > 0));
return menuTreeNode;