diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index c97b8d3f..91262f91 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -29,11 +29,11 @@ - select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time + select menu_id, menu_name, parent_id, order_num, path, component, query, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time from sys_menu - - - @@ -43,96 +43,96 @@ AND visible = #{visible} - AND status = #{status} + AND status = #{status}::integer order by parent_id, order_num - + - + - - + select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.route_name, 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 from sys_menu m - left join sys_role_menu rm on m.menu_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.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 + left join sys_role_menu rm on m.menu_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.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 m.parent_id, m.order_num - + - + - + - + - + - + - + update sys_menu @@ -141,17 +141,18 @@ order_num = #{orderNum}, path = #{path}, component = #{component}, - `query` = #{query}, + query = #{query}, + route_name = #{routeName}, is_frame = #{isFrame}, is_cache = #{isCache}, menu_type = #{menuType}, visible = #{visible}, - status = #{status}, + status = #{status}::integer, perms = #{perms}, icon = #{icon}, remark = #{remark}, update_by = #{updateBy}, - update_time = sysdate() + update_time = current_timestamp where menu_id = #{menuId} @@ -164,7 +165,8 @@ order_num, path, component, - `query`, + query, + route_name, is_frame, is_cache, menu_type, @@ -183,21 +185,22 @@ #{path}, #{component}, #{query}, - #{isFrame}, - #{isCache}, + #{routeName}, + #{isFrame}::integer, + #{isCache}::integer, #{menuType}, #{visible}, - #{status}, + #{status}::integer, #{perms}, #{icon}, #{remark}, #{createBy}, - sysdate() + current_timestamp ) - + - delete from sys_menu where menu_id = #{menuId} + delete from sys_menu where menu_id = #{menuId} \ No newline at end of file