From a178d9fed92793c41c239a3e37b2040bb8eddd89 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 01 九月 2025 16:54:31 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/test/java/com/ruoyi/web/test/BaseTest.java | 8 +++++++-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 12 +++++++++++-
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 18 +++++++++++-------
3 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/web/test/BaseTest.java b/ruoyi-admin/src/test/java/com/ruoyi/web/test/BaseTest.java
index a7d11ba..fac164a 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/web/test/BaseTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/web/test/BaseTest.java
@@ -711,7 +711,7 @@
// String name1 = jsonObject1.getString("name");
// JSONObject meta1 = jsonObject1.getJSONObject("meta");
// String menu_name1 = meta1.getString("title");
-// String showLink1 = meta1.getString("showLink");
+// Boolean showLink1 = meta1.getBoolean("showLink");
// SysMenu sysMenu1 = new SysMenu();
// sysMenu1.setParentId(sysMenu.getMenuId());
// sysMenu1.setMenuName(menu_name1);
@@ -719,6 +719,12 @@
// sysMenu1.setComponent(component);
// sysMenu1.setRoleType(5);
// sysMenu1.setMenuType("C");
+// sysMenu1.setRouterName(name1);
+// if(showLink1){
+// sysMenu1.setVisible("0");
+// }else{
+// sysMenu1.setVisible("1");
+// }
// sysMenuService.insertMenu(sysMenu1);
// JSONArray children2 = jsonObject1.getJSONArray("children");
// if(!CollectionUtils.isEmpty(children2)){
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index 993fa68..f0137de 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -67,7 +67,9 @@
/** 角色类型 1=平台 2=分公司 3=业务员 4=供应商 5=诊所端 6=仓库员 */
@TableField(value = "role_type")
private Integer roleType;
-
+ /** 路由名称 */
+ @TableField(value = "router_name")
+ private String routerName;
/** 子菜单 */
private List<SysMenu> children = new ArrayList<SysMenu>();
@@ -236,6 +238,14 @@
this.icon = icon;
}
+ public String getRouterName() {
+ return routerName;
+ }
+
+ public void setRouterName(String routerName) {
+ this.routerName = routerName;
+ }
+
public List<SysMenu> getChildren()
{
return children;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 17ab894..345f795 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -30,7 +30,7 @@
<sql id="selectMenuVo">
select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible,
- status, ifnull(perms,'') as perms, icon, create_time ,role_type
+ status, ifnull(perms,'') as perms, icon, create_time ,role_type,router_name
from sys_menu
</sql>
@@ -52,14 +52,14 @@
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms,
- m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.role_type
+ m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.role_type, m.router_name
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
order by m.parent_id, m.order_num
</select>
<select id="selectMenuListByUserId" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms,
- m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.role_type
+ m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.role_type, m.router_name
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
@@ -79,7 +79,7 @@
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms,
- m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.role_type
+ m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.role_type, m.router_name
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
@@ -139,7 +139,7 @@
<select id="selectListByRoleId" resultType="com.ruoyi.common.core.domain.entity.SysMenu">
select sm.menu_id AS menuId, sm.menu_name AS menuName, sm.parent_id AS parentId, sm.order_num AS orderNum, sm.`path` AS path, sm.component AS component,
sm.`query` AS query, sm.is_frame AS isFrame,sm.is_cache AS isCache, sm.menu_type AS menuType, sm.visible AS visible, sm.status AS status,
- ifnull(sm.perms,'') as perms, sm.icon AS icon, sm.create_time AS createTime,, sm.role_type
+ ifnull(sm.perms,'') as perms, sm.icon AS icon, sm.create_time AS createTime, sm.role_type, sm.router_name
from sys_role_menu srm
left join sys_menu sm on srm.menu_id = sm.menu_id
WHERE srm.role_id = #{roleId}
@@ -162,7 +162,8 @@
IFNULL( perms, '' ) AS perms,
icon AS icon,
create_time AS createTime,
- role_type AS roleType
+ role_type AS roleType,
+ router_name AS routerName
from sys_menu where menu_id in
<foreach collection="menusId" close=")" index="index" item="id" open="(" separator=",">
#{id}
@@ -185,7 +186,8 @@
IFNULL( perms, '' ) AS perms,
icon AS icon,
create_time AS createTime,
- role_type AS roleType
+ role_type AS roleType,
+ router_name AS routerName
from sys_menu
</select>
@@ -231,6 +233,7 @@
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="roleType != null">role_type,</if>
+ <if test="routerName != null">router_name,</if>
create_time
)values(
<if test="menuId != null and menuId != 0">#{menuId},</if>
@@ -250,6 +253,7 @@
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="roleType != null">#{roleType},</if>
+ <if test="routerName != null">#{routerName},</if>
sysdate()
)
</insert>
--
Gitblit v1.7.1