diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/dao/mapper/SysMenuMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/dao/mapper/SysMenuMapper.xml index 342c654a..aea209e2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/dao/mapper/SysMenuMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/dao/mapper/SysMenuMapper.xml @@ -58,7 +58,7 @@ sys_menu WHERE system_type = #{systemType} - and type != '4' + and type != '4' and path is not null and path ]]> '' and menu_id IN ( SELECT diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/dto/MenuDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/dto/MenuDto.java index 98816ee1..020558f0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/dto/MenuDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/dto/MenuDto.java @@ -30,6 +30,9 @@ public class MenuDto extends BaseDTO implements Serializable { private List children; + /** + * 1是系统2是目录3是菜单 4权限 + */ private String type; private String permission; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java index 2c77f7df..caf74e4e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java @@ -416,7 +416,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (!menuDTO.getIframe()) { if (pid.equals(menuDTO.getPid())) { menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent()) ? "Layout" : menuDTO.getComponent()); - } else if (!pid.equals(menuDTO.getPid()) && "0".equals(menuDTO.getType())) { + //"2".equals(menuDTO.getType() 判断是不是目录 + } else if (!pid.equals(menuDTO.getPid()) && "2".equals(menuDTO.getType())) { menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent()) ? "ParentView" : menuDTO.getComponent()); } else if (!StrUtil.isEmpty(menuDTO.getComponent())) {