rev:菜单系统type不一致问题

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 <![CDATA[<>]]> ''
         and
         menu_id IN (
         SELECT

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<MenuDto> children;
 
+    /**
+     * 1是系统2是目录3是菜单 4权限
+     */
     private String type;
 
     private String permission;

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<SysMenuMapper, SysMenu> 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())) {