From 5871d812c3b6d37bec0a628a248afb93df4de2de Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 23 Mar 2021 22:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.2=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=8A=A0=E4=B8=80=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/system/modular/menu/entity/SysMenu.java    | 6 ++++++
 .../system/modular/menu/factory/AntdMenusFactory.java       | 2 +-
 .../modular/menu/service/impl/SysMenuServiceImpl.java       | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java
index 48b268518..2199f2e25 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java
@@ -149,6 +149,12 @@ public class SysMenu extends BaseEntity implements AbstractTreeNode {
     @TableField("antdv_link_url")
     private String antdvLinkUrl;
 
+    /**
+     * 用于非菜单显示页面的重定向url设置
+     */
+    @TableField("antdv_uid_url")
+    private String antdvUidUrl;
+
     /**
      * 是否删除：Y-被删除，N-未删除
      */
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java
index da75de4e8..be01453d3 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java
@@ -93,7 +93,7 @@ public class AntdMenusFactory {
                 antdvMenuItem.setPath(sysMenu.getAntdvRouter());
                 antdvMenuItem.setComponent(sysMenu.getAntdvComponent());
                 antdvMenuItem.setHide(YesOrNotEnum.N.getCode().equals(sysMenu.getVisible()));
-                antdvMenuItem.setUid(null);
+                antdvMenuItem.setUid(sysMenu.getAntdvUidUrl());
                 if (ObjectUtil.isNotEmpty(sysMenu.getChildren())) {
                     antdvMenuItem.setChildren(doModelTransfer(sysMenu.getChildren()));
                 }
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java
index 460cf444e..a36eb4e67 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java
@@ -281,6 +281,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                 SysMenu::getAntdvRouter,
                 SysMenu::getAntdvComponent,
                 SysMenu::getVisible,
+                SysMenu::getAntdvUidUrl,
                 SysMenu::getMenuId,
                 SysMenu::getMenuParentId);
         wrapper.eq(SysMenu::getStatusFlag, StatusEnum.ENABLE.getCode());