|
@@ -5,27 +5,29 @@
|
|
<mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
|
|
<mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
|
|
|
|
|
|
<resultMap type="SysMenu" id="SysMenuResult">
|
|
<resultMap type="SysMenu" id="SysMenuResult">
|
|
- <id property="menuId" column="menu_id" />
|
|
|
|
- <result property="menuName" column="menu_name" />
|
|
|
|
- <result property="parentName" column="parent_name" />
|
|
|
|
- <result property="parentId" column="parent_id" />
|
|
|
|
- <result property="orderNum" column="order_num" />
|
|
|
|
- <result property="path" column="path" />
|
|
|
|
- <result property="component" column="component" />
|
|
|
|
- <result property="query" column="query" />
|
|
|
|
- <result property="isFrame" column="is_frame" />
|
|
|
|
- <result property="isCache" column="is_cache" />
|
|
|
|
- <result property="menuType" column="menu_type" />
|
|
|
|
- <result property="visible" column="visible" />
|
|
|
|
- <result property="status" column="status" />
|
|
|
|
- <result property="perms" column="perms" />
|
|
|
|
- <result property="icon" column="icon" />
|
|
|
|
- <result property="createBy" column="create_by" />
|
|
|
|
- <result property="createTime" column="create_time" />
|
|
|
|
- <result property="updateTime" column="update_time" />
|
|
|
|
- <result property="updateBy" column="update_by" />
|
|
|
|
- <result property="remark" column="remark" />
|
|
|
|
- <result property="type" column="type" />
|
|
|
|
|
|
+ <id property="menuId" column="menu_id"/>
|
|
|
|
+ <result property="menuName" column="menu_name"/>
|
|
|
|
+ <result property="parentName" column="parent_name"/>
|
|
|
|
+ <result property="parentId" column="parent_id"/>
|
|
|
|
+ <result property="orderNum" column="order_num"/>
|
|
|
|
+ <result property="path" column="path"/>
|
|
|
|
+ <result property="component" column="component"/>
|
|
|
|
+ <result property="query" column="query"/>
|
|
|
|
+ <result property="isFrame" column="is_frame"/>
|
|
|
|
+ <result property="isCache" column="is_cache"/>
|
|
|
|
+ <result property="menuType" column="menu_type"/>
|
|
|
|
+ <result property="visible" column="visible"/>
|
|
|
|
+ <result property="status" column="status"/>
|
|
|
|
+ <result property="perms" column="perms"/>
|
|
|
|
+ <result property="icon" column="icon"/>
|
|
|
|
+ <result property="createBy" column="create_by"/>
|
|
|
|
+ <result property="createTime" column="create_time"/>
|
|
|
|
+ <result property="updateTime" column="update_time"/>
|
|
|
|
+ <result property="updateBy" column="update_by"/>
|
|
|
|
+ <result property="remark" column="remark"/>
|
|
|
|
+ <result property="type" column="type"/>
|
|
|
|
+ <result property="background" column="background"/>
|
|
|
|
+ <result property="color" column="color"/>
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectMenuVo">
|
|
<sql id="selectMenuVo">
|
|
@@ -44,6 +46,8 @@
|
|
ifnull(perms, '') as perms,
|
|
ifnull(perms, '') as perms,
|
|
icon,
|
|
icon,
|
|
type,
|
|
type,
|
|
|
|
+ background,
|
|
|
|
+ color,
|
|
create_time
|
|
create_time
|
|
from sys_menu
|
|
from sys_menu
|
|
</sql>
|
|
</sql>
|
|
@@ -80,7 +84,9 @@
|
|
m.icon,
|
|
m.icon,
|
|
m.order_num,
|
|
m.order_num,
|
|
m.create_time,
|
|
m.create_time,
|
|
- m.type
|
|
|
|
|
|
+ m.type,
|
|
|
|
+ m.background,
|
|
|
|
+ m.color
|
|
from sys_menu m
|
|
from sys_menu m
|
|
where m.menu_type in ('M', 'C')
|
|
where m.menu_type in ('M', 'C')
|
|
and m.status = 0
|
|
and m.status = 0
|
|
@@ -89,7 +95,8 @@
|
|
|
|
|
|
<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.`query`, m.visible, m.status,
|
|
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status,
|
|
- ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num,m.type, m.create_time
|
|
|
|
|
|
+ ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num,m.type, m.create_time,
|
|
|
|
+ m.background, m.color
|
|
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.menu_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
|
|
@@ -123,7 +130,9 @@
|
|
m.icon,
|
|
m.icon,
|
|
m.order_num,
|
|
m.order_num,
|
|
m.create_time,
|
|
m.create_time,
|
|
- m.type
|
|
|
|
|
|
+ m.type,
|
|
|
|
+ m.background,
|
|
|
|
+ m.color
|
|
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.menu_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
|
|
@@ -203,6 +212,8 @@
|
|
<if test="icon !=null and icon != ''">icon = #{icon},</if>
|
|
<if test="icon !=null and icon != ''">icon = #{icon},</if>
|
|
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
|
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
|
<if test="type != null and type != ''">type = #{type},</if>
|
|
<if test="type != null and type != ''">type = #{type},</if>
|
|
|
|
+ <if test="background != null and background != ''">background = #{background},</if>
|
|
|
|
+ <if test="color != null and color != ''">color = #{color},</if>
|
|
<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>
|
|
@@ -227,6 +238,8 @@
|
|
<if test="icon != null and icon != ''">icon,</if>
|
|
<if test="icon != null and icon != ''">icon,</if>
|
|
<if test="remark != null and remark != ''">remark,</if>
|
|
<if test="remark != null and remark != ''">remark,</if>
|
|
<if test="type != null and type != ''">type,</if>
|
|
<if test="type != null and type != ''">type,</if>
|
|
|
|
+ <if test="background != null and background != ''">background,</if>
|
|
|
|
+ <if test="color != null and color != ''">color,</if>
|
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
|
create_time
|
|
create_time
|
|
)values(
|
|
)values(
|
|
@@ -246,6 +259,8 @@
|
|
<if test="icon != null and icon != ''">#{icon},</if>
|
|
<if test="icon != null and icon != ''">#{icon},</if>
|
|
<if test="remark != null and remark != ''">#{remark},</if>
|
|
<if test="remark != null and remark != ''">#{remark},</if>
|
|
<if test="type != null and type != ''">#{type},</if>
|
|
<if test="type != null and type != ''">#{type},</if>
|
|
|
|
+ <if test="background != null and background != ''">#{background},</if>
|
|
|
|
+ <if test="color != null and color != ''">#{color},</if>
|
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
|
sysdate()
|
|
sysdate()
|
|
)
|
|
)
|