@@ -32,7 +32,10 @@ | |||
select | |||
<include refid="Base_Column_List"/> | |||
from op_menus | |||
where mark = 1 and parent_id = 0 and client_id = #{clientId} | |||
where mark = 1 and parent_id = 0 | |||
<if test="clientId != null and clientId !=''"> | |||
and client_id = #{clientId} | |||
</if> | |||
and status = 1 | |||
and id in (select menu_id from op_role_menu where role_id = #{roleId} and mark = 1) | |||
order by sort asc |