From 05331eb99d0688df83c50e82999f1064cff8e322 Mon Sep 17 00:00:00 2001
From: cain <704880626@qq.com>
Date: Fri, 19 Jul 2019 12:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Etable=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2=20=E4=BF=AE=E5=A4=8D=E6=99=AE?=
 =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=88=B7=E6=89=93=E5=BC=80=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=86=85=E5=AE=B9=E4=B8=BA=E7=A9=BA(?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=AD=97=E6=AE=B5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/css/style.css   |   5 +
 .../resources/mapper/system/SysMenuMapper.xml | 152 +++++++++---------
 2 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/css/style.css b/ruoyi-admin/src/main/resources/static/css/style.css
index ec08c0a1d..e731a84d5 100644
--- a/ruoyi-admin/src/main/resources/static/css/style.css
+++ b/ruoyi-admin/src/main/resources/static/css/style.css
@@ -7065,4 +7065,9 @@ body.rtls .top-navigation .footer.fixed, body.rtls.top-navigation .footer.fixed
 	top: 0px;
 	z-index: 9998;
 	margin: 0;
+}
+
+.selected{
+    background-color: #E8F7FD;
+    color: #1890ff;
 }
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index deacfba07..47f9b8376 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
 
 	<resultMap type="SysMenu" id="SysMenuResult">
@@ -22,14 +22,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"       column="update_by"      />
 		<result property="remark"         column="remark"         />
 	</resultMap>
-	
+
 	<sql id="selectMenuVo">
         select menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, ifnull(perms,'') as perms, icon, create_by, create_time 
 		from sys_menu
     </sql>
-    
-    <select id="selectMenusByUserId" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
+
+	<select id="selectMenusByUserId" parameterType="Long" resultMap="SysMenuResult">
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, ifnull(m.perms,'') as perms, m.target, 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
@@ -39,19 +39,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectMenuNormalAll" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 		where m.menu_type in ('M', 'C') and m.visible = 0
 		order by m.parent_id, m.order_num
 	</select>
-	
+
 	<select id="selectMenuAll" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		order by parent_id, order_num
 	</select>
-	
+
 	<select id="selectMenuAllByUserId" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, ifnull(m.perms,'') as perms, m.target, 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
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where ur.user_id = #{userId}
 		order by m.parent_id, m.order_num
 	</select>
-	
+
 	<select id="selectPermsByUserId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		from sys_menu m
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 		where ur.user_id = #{userId}
 	</select>
-	
+
 	<select id="selectMenuTree" parameterType="Long" resultType="String">
 		select concat(m.menu_id, ifnull(m.perms,'')) as perms
 		from sys_menu m
@@ -75,10 +75,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where rm.role_id = #{roleId}
 		order by m.parent_id, m.order_num
 	</select>
-	
+
 	<select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
-        <include refid="selectMenuVo"/>
-        <where>
+		<include refid="selectMenuVo"/>
+		<where>
 			<if test="menuName != null and menuName != ''">
 				AND menu_name like concat('%', #{menuName}, '%')
 			</if>
@@ -87,14 +87,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</if>
 		</where>
 		order by parent_id, order_num
-    </select>
-    
-    <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-        select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
+	</select>
+
+	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, ifnull(m.perms,'') as perms, m.target, 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_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
 		where ur.user_id = #{params.userId}
 		<if test="menuName != null and menuName != ''">
 			AND m.menu_name like concat('%', #{menuName}, '%')
@@ -103,77 +103,77 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND m.visible = #{visible}
 		</if>
 		order by m.parent_id, m.order_num
-    </select>
-    
+	</select>
+
 	<delete id="deleteMenuById" parameterType="Long">
 	    delete from sys_menu where menu_id = #{menuId} or parent_id = #{menuId}
 	</delete>
-	
+
 	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
 		SELECT t.menu_id, t.parent_id, t.menu_name, t.order_num, t.url, t.target, t.menu_type, t.visible, t.perms, t.icon, t.remark,
 			(SELECT menu_name FROM sys_menu WHERE menu_id = t.parent_id) parent_name
 		FROM sys_menu t
 		where t.menu_id = #{menuId}
 	</select>
-	
+
 	<select id="selectCountMenuByParentId" resultType="Integer">
 	    select count(1) from sys_menu where parent_id=#{menuId}  
 	</select>
-	
+
 	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		where menu_name=#{menuName} and parent_id = #{parentId}
 	</select>
-	
+
 	<update id="updateMenu" parameterType="SysMenu">
- 		update sys_menu
- 		<set>
- 			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
- 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
- 			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
- 			<if test="url != null and url != ''">url = #{url},</if>
- 			<if test="target != null and target != ''">target = #{target},</if>
- 			<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
- 			<if test="visible != null">visible = #{visible},</if>
- 			<if test="perms !=null">perms = #{perms},</if>
- 			<if test="icon !=null and icon != ''">icon = #{icon},</if>
- 			<if test="remark != null and remark != ''">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where menu_id = #{menuId}
+		update sys_menu
+		<set>
+			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
+			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
+			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+			<if test="url != null and url != ''">url = #{url},</if>
+			<if test="target != null and target != ''">target = #{target},</if>
+			<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
+			<if test="visible != null">visible = #{visible},</if>
+			<if test="perms !=null">perms = #{perms},</if>
+			<if test="icon !=null and icon != ''">icon = #{icon},</if>
+			<if test="remark != null and remark != ''">remark = #{remark},</if>
+			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			update_time = sysdate()
+		</set>
+		where menu_id = #{menuId}
 	</update>
- 	
- 	<insert id="insertMenu" parameterType="SysMenu">
- 		insert into sys_menu(
- 			<if test="menuId != null and menuId != 0">menu_id,</if>
- 			<if test="parentId != null and parentId != 0">parent_id,</if>
- 			<if test="menuName != null and menuName != ''">menu_name,</if>
- 			<if test="orderNum != null and orderNum != ''">order_num,</if>
- 			<if test="url != null and url != ''">url,</if>
- 			<if test="target != null and target != ''">target,</if>
- 			<if test="menuType != null and menuType != ''">menu_type,</if>
- 			<if test="visible != null">visible,</if>
- 			<if test="perms !=null and perms != ''">perms,</if>
- 			<if test="icon != null and icon != ''">icon,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="menuId != null and menuId != 0">#{menuId},</if>
- 			<if test="parentId != null and parentId != 0">#{parentId},</if>
- 			<if test="menuName != null and menuName != ''">#{menuName},</if>
- 			<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
- 			<if test="url != null and url != ''">#{url},</if>
- 			<if test="target != null and target != ''">#{target},</if>
- 			<if test="menuType != null and menuType != ''">#{menuType},</if>
- 			<if test="visible != null">#{visible},</if>
- 			<if test="perms !=null and perms != ''">#{perms},</if>
- 			<if test="icon != null and icon != ''">#{icon},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
+
+	<insert id="insertMenu" parameterType="SysMenu">
+		insert into sys_menu(
+		<if test="menuId != null and menuId != 0">menu_id,</if>
+		<if test="parentId != null and parentId != 0">parent_id,</if>
+		<if test="menuName != null and menuName != ''">menu_name,</if>
+		<if test="orderNum != null and orderNum != ''">order_num,</if>
+		<if test="url != null and url != ''">url,</if>
+		<if test="target != null and target != ''">target,</if>
+		<if test="menuType != null and menuType != ''">menu_type,</if>
+		<if test="visible != null">visible,</if>
+		<if test="perms !=null and perms != ''">perms,</if>
+		<if test="icon != null and icon != ''">icon,</if>
+		<if test="remark != null and remark != ''">remark,</if>
+		<if test="createBy != null and createBy != ''">create_by,</if>
+		create_time
+		)values(
+		<if test="menuId != null and menuId != 0">#{menuId},</if>
+		<if test="parentId != null and parentId != 0">#{parentId},</if>
+		<if test="menuName != null and menuName != ''">#{menuName},</if>
+		<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
+		<if test="url != null and url != ''">#{url},</if>
+		<if test="target != null and target != ''">#{target},</if>
+		<if test="menuType != null and menuType != ''">#{menuType},</if>
+		<if test="visible != null">#{visible},</if>
+		<if test="perms !=null and perms != ''">#{perms},</if>
+		<if test="icon != null and icon != ''">#{icon},</if>
+		<if test="remark != null and remark != ''">#{remark},</if>
+		<if test="createBy != null and createBy != ''">#{createBy},</if>
+		sysdate()
+		)
 	</insert>
-	
+
 </mapper> 
\ No newline at end of file