|
|
@@ -78,7 +78,7 @@
|
|
|
</if>
|
|
|
order by m.parent_id, m.order_num
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
|
|
|
select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, 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.create_by, m.update_by
|
|
|
@@ -88,7 +88,17 @@
|
|
|
left join sys_user_role ur on rm.role_id = ur.role_id
|
|
|
left join sys_role ro on ur.role_id = ro.id
|
|
|
left join sys_user u on ur.user_id = u.id
|
|
|
- where (u.id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0) or m.visible = 1
|
|
|
+ where u.id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
|
|
|
+ union
|
|
|
+ select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, 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.create_by, m.update_by
|
|
|
+ , m.update_time, m.remark, m.sys_table_name
|
|
|
+ from sys_menu m
|
|
|
+ left join sys_role_menu rm on m.id = rm.menu_id
|
|
|
+ left join sys_user_role ur on rm.role_id = ur.role_id
|
|
|
+ left join sys_role ro on ur.role_id = ro.id
|
|
|
+ left join sys_user u on ur.user_id = u.id
|
|
|
+ where m.visible = 1
|
|
|
</select>
|
|
|
|
|
|
<select id="listBtnByUserId" parameterType="Long" resultMap="SysMenuResult">
|
