From 8df349f3779bb4c2ae5f2dc25170d6a9cc14108b Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Sat, 6 May 2023 14:37:02 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E8=8F=9C=E5=8D=95=E7=B3=BB=E7=BB=9Ftype?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system_manage/service/menu/dao/mapper/SysMenuMapper.xml | 2 +- .../org/nl/wms/system_manage/service/menu/dto/MenuDto.java | 3 +++ .../system_manage/service/menu/impl/SysMenuServiceImpl.java | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) 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())) {