|
|
@@ -50,7 +50,7 @@
|
|
|
|
|
|
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
|
|
|
select distinct m.menu_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.icon_url
|
|
|
- from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
|
|
|
+ from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 order by order_num
|
|
|
-- order by m.parent_id, m.order_num
|
|
|
</select>
|
|
|
|
|
|
@@ -81,6 +81,7 @@
|
|
|
left join sys_role ro on ur.role_id = ro.role_id
|
|
|
left join sys_user u on ur.user_id = u.user_id
|
|
|
where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
|
|
|
+ order by order_num
|
|
|
-- order by m.parent_id, m.order_num
|
|
|
</select>
|
|
|
|
|
|
@@ -245,6 +246,7 @@
|
|
|
WHERE cp.scp_company_id = #{companyId}
|
|
|
AND (NOW() BETWEEN cp.scp_start_date AND cp.scp_end_date)
|
|
|
AND sp.spi_is_del='00' AND sp.spi_state='00'
|
|
|
+ order by m.order_num
|
|
|
-- order by m.parent_id, m.order_num
|
|
|
</select>
|
|
|
<select id="selectMenuTreeByCommonUser" parameterType="java.util.Map" resultMap="SysMenuResult">
|
