|
@@ -5,7 +5,7 @@
|
|
<mapper namespace="com.boman.system.mapper.SysMenuMapper">
|
|
<mapper namespace="com.boman.system.mapper.SysMenuMapper">
|
|
|
|
|
|
<resultMap type="SysMenu" id="SysMenuResult">
|
|
<resultMap type="SysMenu" id="SysMenuResult">
|
|
- <id property="menuId" column="menu_id" />
|
|
|
|
|
|
+ <id property="id" column="id" />
|
|
<result property="menuName" column="menu_name" />
|
|
<result property="menuName" column="menu_name" />
|
|
<result property="parentName" column="parent_name" />
|
|
<result property="parentName" column="parent_name" />
|
|
<result property="parentId" column="parent_id" />
|
|
<result property="parentId" column="parent_id" />
|
|
@@ -27,7 +27,7 @@
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectMenuVo">
|
|
<sql id="selectMenuVo">
|
|
- select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
|
|
|
|
|
|
+ select id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
|
|
from sys_menu
|
|
from sys_menu
|
|
</sql>
|
|
</sql>
|
|
|
|
|
|
@@ -48,17 +48,17 @@
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
|
|
<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
|
|
|
|
|
|
+ select distinct m.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
|
|
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 m.parent_id, m.order_num
|
|
order by m.parent_id, m.order_num
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
|
|
<select id="selectMenuListByUserId" parameterType="SysMenu" 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
|
|
|
|
|
|
+ select distinct m.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
|
|
from sys_menu m
|
|
from sys_menu m
|
|
- left join sys_role_menu rm on m.menu_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.role_id
|
|
|
|
|
|
+ left join sys_role ro on ur.role_id = ro.id
|
|
where ur.user_id = #{params.userId}
|
|
where ur.user_id = #{params.userId}
|
|
<if test="menuName != null and menuName != ''">
|
|
<if test="menuName != null and menuName != ''">
|
|
AND menu_name like concat('%', #{menuName}, '%')
|
|
AND menu_name like concat('%', #{menuName}, '%')
|
|
@@ -72,51 +72,51 @@
|
|
order by m.parent_id, m.order_num
|
|
order by m.parent_id, m.order_num
|
|
</select>
|
|
</select>
|
|
|
|
|
|
- <select id="selectMenuTreeByUserId" parameterType="Long" 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
|
|
|
|
|
|
+ <select id="selectMenuTreeById" parameterType="Long" resultMap="SysMenuResult">
|
|
|
|
+ select distinct m.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
|
|
from sys_menu m
|
|
from sys_menu m
|
|
- left join sys_role_menu rm on m.menu_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.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 ro on ur.role_id = ro.id
|
|
|
|
+ left join sys_user u on ur.user_id = u.id
|
|
|
|
+ where u.id = #id} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
|
|
order by m.parent_id, m.order_num
|
|
order by m.parent_id, m.order_num
|
|
</select>
|
|
</select>
|
|
|
|
|
|
- <select id="selectMenuListByRoleId" resultType="Integer">
|
|
|
|
- select m.menu_id
|
|
|
|
|
|
+ <select id="selectMenuListByRoleId" resultType="java.lang.Integer">
|
|
|
|
+ select m.id
|
|
from sys_menu m
|
|
from sys_menu m
|
|
- left join sys_role_menu rm on m.menu_id = rm.menu_id
|
|
|
|
|
|
+ left join sys_role_menu rm on m.id = rm.menu_id
|
|
where rm.role_id = #{roleId}
|
|
where rm.role_id = #{roleId}
|
|
<if test="menuCheckStrictly">
|
|
<if test="menuCheckStrictly">
|
|
- and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
|
|
|
|
|
|
+ and m.id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.id = rm.menu_id and rm.role_id = #{roleId})
|
|
</if>
|
|
</if>
|
|
order by m.parent_id, m.order_num
|
|
order by m.parent_id, m.order_num
|
|
</select>
|
|
</select>
|
|
|
|
|
|
- <select id="selectMenuPerms" resultType="String">
|
|
|
|
|
|
+ <select id="selectMenuPerms" resultType="java.lang.String">
|
|
select distinct m.perms
|
|
select distinct m.perms
|
|
from sys_menu m
|
|
from sys_menu m
|
|
- left join sys_role_menu rm on m.menu_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
|
|
</select>
|
|
</select>
|
|
|
|
|
|
- <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
|
|
|
|
|
|
+ <select id="selectMenuPermsById" parameterType="Long" resultType="java.lang.String">
|
|
select distinct m.perms
|
|
select distinct m.perms
|
|
from sys_menu m
|
|
from sys_menu m
|
|
- left join sys_role_menu rm on m.menu_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 r on r.role_id = ur.role_id
|
|
|
|
- where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
|
|
|
|
|
|
+ left join sys_role r on r.id = ur.role_id
|
|
|
|
+ where m.status = '0' and r.status = '0' and ur.user_id = #{id}
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
|
|
<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
|
|
<include refid="selectMenuVo"/>
|
|
<include refid="selectMenuVo"/>
|
|
- where menu_id = #{menuId}
|
|
|
|
|
|
+ where id = #{id}
|
|
</select>
|
|
</select>
|
|
|
|
|
|
- <select id="hasChildByMenuId" resultType="Integer">
|
|
|
|
- select count(1) from sys_menu where parent_id = #{menuId}
|
|
|
|
|
|
+ <select id="hasChildById" resultType="java.lang.Integer">
|
|
|
|
+ select count(1) from sys_menu where parent_id = #{id}
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
|
|
<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
|
|
@@ -143,12 +143,12 @@
|
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
|
update_time = sysdate()
|
|
update_time = sysdate()
|
|
</set>
|
|
</set>
|
|
- where menu_id = #{menuId}
|
|
|
|
|
|
+ where id = #{id}
|
|
</update>
|
|
</update>
|
|
|
|
|
|
<insert id="insertMenu" parameterType="SysMenu">
|
|
<insert id="insertMenu" parameterType="SysMenu">
|
|
insert into sys_menu(
|
|
insert into sys_menu(
|
|
- <if test="menuId != null and menuId != 0">menu_id,</if>
|
|
|
|
|
|
+ <if test="id != null and id != 0">id,</if>
|
|
<if test="parentId != null and parentId != 0">parent_id,</if>
|
|
<if test="parentId != null and parentId != 0">parent_id,</if>
|
|
<if test="menuName != null and menuName != ''">menu_name,</if>
|
|
<if test="menuName != null and menuName != ''">menu_name,</if>
|
|
<if test="orderNum != null and orderNum != ''">order_num,</if>
|
|
<if test="orderNum != null and orderNum != ''">order_num,</if>
|
|
@@ -165,7 +165,7 @@
|
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
|
create_time
|
|
create_time
|
|
)values(
|
|
)values(
|
|
- <if test="menuId != null and menuId != 0">#{menuId},</if>
|
|
|
|
|
|
+ <if test="id != null and id != 0">#{id},</if>
|
|
<if test="parentId != null and parentId != 0">#{parentId},</if>
|
|
<if test="parentId != null and parentId != 0">#{parentId},</if>
|
|
<if test="menuName != null and menuName != ''">#{menuName},</if>
|
|
<if test="menuName != null and menuName != ''">#{menuName},</if>
|
|
<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
|
|
<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
|
|
@@ -185,7 +185,7 @@
|
|
</insert>
|
|
</insert>
|
|
|
|
|
|
<delete id="deleteMenuById" parameterType="Long">
|
|
<delete id="deleteMenuById" parameterType="Long">
|
|
- delete from sys_menu where menu_id = #{menuId}
|
|
|
|
|
|
+ delete from sys_menu where id = #{id}
|
|
</delete>
|
|
</delete>
|
|
|
|
|
|
</mapper>
|
|
</mapper>
|