|
@@ -35,6 +35,7 @@
|
|
<select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
|
|
<select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
|
|
<include refid="selectMenuVo"/>
|
|
<include refid="selectMenuVo"/>
|
|
<where>
|
|
<where>
|
|
|
|
+ status = '0'
|
|
<if test="id != null and id != ''">
|
|
<if test="id != null and id != ''">
|
|
AND id = #{id}
|
|
AND id = #{id}
|
|
</if>
|
|
</if>
|
|
@@ -66,7 +67,7 @@
|
|
left join sys_role_menu rm on m.id = rm.menu_id
|
|
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_user_role ur on rm.role_id = ur.role_id
|
|
left join sys_role ro on ur.role_id = ro.id
|
|
left join sys_role ro on ur.role_id = ro.id
|
|
- where ur.user_id = #{params.userId}
|
|
|
|
|
|
+ where ur.user_id = #{params.userId} and m.status = '0'
|
|
<if test="menuName != null and menuName != ''">
|
|
<if test="menuName != null and menuName != ''">
|
|
AND menu_name like concat('%', #{menuName}, '%')
|
|
AND menu_name like concat('%', #{menuName}, '%')
|
|
</if>
|
|
</if>
|
|
@@ -98,7 +99,7 @@
|
|
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.id
|
|
left join sys_role ro on ur.role_id = ro.id
|
|
left join sys_user u on ur.user_id = u.id
|
|
left join sys_user u on ur.user_id = u.id
|
|
- where m.visible = 1
|
|
|
|
|
|
+ where m.visible = 1 and and m.status = '0'
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="listBtnByUserId" parameterType="Long" resultMap="SysMenuResult">
|
|
<select id="listBtnByUserId" parameterType="Long" resultMap="SysMenuResult">
|
|
@@ -175,8 +176,9 @@
|
|
FROM
|
|
FROM
|
|
sys_menu m
|
|
sys_menu m
|
|
LEFT JOIN sys_role_menu rm ON m.id = rm.menu_id
|
|
LEFT JOIN sys_role_menu rm ON m.id = rm.menu_id
|
|
|
|
+ WHERE m.status = '0'
|
|
<if test="roleId != null and roleId != ''">
|
|
<if test="roleId != null and roleId != ''">
|
|
- WHERE rm.role_id = #{roleId}
|
|
|
|
|
|
+ and rm.role_id = #{roleId}
|
|
</if>
|
|
</if>
|
|
</select>
|
|
</select>
|
|
|
|
|