From 4a3467b5d66db6ede3b4cc1b942399c7a36aadf5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 28 八月 2025 14:01:15 +0800
Subject: [PATCH] 权限

---
 ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 17f8a9b..cca4e22 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -25,10 +25,12 @@
 		<result property="updateTime"     column="update_time"    />
 		<result property="updateBy"       column="update_by"      />
 		<result property="remark"         column="remark"         />
+		<result property="roleType"         column="role_type"         />
 	</resultMap>
 
 	<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 
+        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
 		from sys_menu
     </sql>
     
@@ -49,13 +51,15 @@
 	</select>
 	
 	<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
+		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
 		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="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
+		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
 		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
@@ -74,7 +78,8 @@
 	</select>
     
     <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
+		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
 		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
@@ -134,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
+		       ifnull(sm.perms,'') as perms, sm.icon AS icon, sm.create_time AS createTime,, sm.role_type
 		from sys_role_menu srm
 		left join sys_menu sm on srm.menu_id = sm.menu_id
 		WHERE srm.role_id = #{roleId}
@@ -156,7 +161,8 @@
 		STATUS AS STATUS,
 		IFNULL( perms, '' ) AS perms,
 		icon AS icon,
-		create_time AS createTime
+		create_time AS createTime,
+		role_type AS roleType
 		from sys_menu where menu_id in
 		<foreach collection="menusId" close=")" index="index" item="id" open="(" separator=",">
 			#{id}
@@ -178,7 +184,8 @@
 			STATUS AS STATUS,
 			IFNULL( perms, '' ) AS perms,
 			icon AS icon,
-			create_time AS createTime
+			create_time AS createTime,
+			role_type AS roleType
 		from sys_menu
 	</select>
 

--
Gitblit v1.7.1