From a59eb8d5d5bcd6a2433a9864522b7afbed7ad5a8 Mon Sep 17 00:00:00 2001 From: lihuangbin666 <1361490203@qq.com> Date: Fri, 24 Apr 2026 17:38:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/apelet/tenantadmin/upms/controller/LoginController.java | 2 +- .../java/apelet/tenantadmin/upms/model/constant/SysMenuType.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java index a65d018..e106625 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java @@ -1472,7 +1472,7 @@ public class LoginController { List onlineMenuPermList = allMenuPermList.stream() .filter(m -> m.getOnlineFormId() != null // && m.getOnlineFlowEntryId() == null - && m.getMenuType().equals(SysMenuType.TYPE_MENU)) + && (m.getMenuType().equals(SysMenuType.TYPE_MENU) || m.getMenuType().equals(SysMenuType.TYPE_PERM_MENU))) .collect(Collectors.toList()); Map> onlineMenuPermMap = onlineMenuPermList.stream().collect(Collectors.groupingBy(SysMenuPerm::getOnlineFormId)); diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/model/constant/SysMenuType.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/model/constant/SysMenuType.java index ad28729..950ec9b 100644 --- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/model/constant/SysMenuType.java +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/model/constant/SysMenuType.java @@ -27,6 +27,10 @@ public final class SysMenuType { * 按钮类型。 */ public static final int TYPE_BUTTON = 3; + /** + * 权限表单。 + */ + public static final int TYPE_PERM_MENU = 4; private static final Map DICT_MAP = new HashMap<>(4); static { @@ -34,6 +38,7 @@ public final class SysMenuType { DICT_MAP.put(TYPE_MENU, "普通菜单"); DICT_MAP.put(TYPE_UI_FRAGMENT, "表单片段类型"); DICT_MAP.put(TYPE_BUTTON, "按钮类型"); + DICT_MAP.put(TYPE_PERM_MENU, "权限菜单"); } /**