|
@@ -204,11 +204,11 @@
|
|
|
order by m.parent_id, m.order_num
|
|
order by m.parent_id, m.order_num
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
- <select id="selectMenuTreeByUserId1" parameterType="Long" resultMap="SysMenuResult">
|
|
|
|
|
|
|
+ <select id="selectMenuTreeByUserId1" parameterType="map" resultMap="SysMenuResult">
|
|
|
select distinct m.menu_id,
|
|
select distinct m.menu_id,
|
|
|
m.parent_id,
|
|
m.parent_id,
|
|
|
m.menu_name,
|
|
m.menu_name,
|
|
|
- rm.menu_alias_name,
|
|
|
|
|
|
|
+ t.menu_alias_name,
|
|
|
m.path,
|
|
m.path,
|
|
|
m.component,
|
|
m.component,
|
|
|
m.visible,
|
|
m.visible,
|
|
@@ -228,8 +228,10 @@
|
|
|
left join sys_user_role ur on rm.role_id = ur.role_id
|
|
left join sys_user_role ur on rm.role_id = ur.role_id
|
|
|
left join sys_role ro on ur.role_id = ro.role_id
|
|
left join sys_role ro on ur.role_id = ro.role_id
|
|
|
left join sys_user u on u.user_id = ur.user_id
|
|
left join sys_user u on u.user_id = ur.user_id
|
|
|
- left join sys_tenant_menu t on u.tenant_id = t.tenant_id
|
|
|
|
|
|
|
+ left join sys_tenant_menu t on m.menu_id = t.menu_id
|
|
|
where u.user_id = #{userId}
|
|
where u.user_id = #{userId}
|
|
|
|
|
+ and ur.tenant_id = #{tenantId}
|
|
|
|
|
+ and t.tenant_id = #{tenantId}
|
|
|
and m.menu_type in ('M', 'C')
|
|
and m.menu_type in ('M', 'C')
|
|
|
and m.status = 0
|
|
and m.status = 0
|
|
|
AND ro.status = 0
|
|
AND ro.status = 0
|
