表名调整&用户权限修改父子联动

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -145,8 +145,8 @@ public class SysMenuController extends BaseController
     /**
      * 加载对应用户菜单列表树
      */
-    @GetMapping(value = "/roleUserMenuTreeselect/{userId}")
-    public AjaxResult roleUserMenuTreeselect(@PathVariable("userId") Long userId)
+    @GetMapping(value = "/userMenuTreeselect/{userId}")
+    public AjaxResult userMenuTreeselect(@PathVariable("userId") Long userId)
     {
         //管理员菜单
         List<SysMenu> menus = menuService.selectMenuList(1L);

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleUserMenu.java

@@ -4,11 +4,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- * 用户和菜单关联 sys_role_user_menu
+ * 用户和菜单关联 sys_user_menu
  * 
  * @author ruoyi
  */
-public class SysRoleUserMenu
+public class SyUserMenu
 {
     /** 角色ID */
     private Long userId;

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleUserMenuMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.ruoyi.system.domain.SysRoleUserMenu;
+import com.ruoyi.system.domain.SyUserMenu;
 
 import java.util.List;
 
@@ -9,7 +9,7 @@ import java.util.List;
  * 
  * @author ruoyi
  */
-public interface SysRoleUserMenuMapper
+public interface SysUserMenuMapper
 {
     /**
      * 查询菜单使用数量
@@ -25,7 +25,7 @@ public interface SysRoleUserMenuMapper
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteRoleUserMenuByUserId(Long userId);
+    public int deleteUserMenuByUserId(Long userId);
 
     /**
      * 批量删除用户菜单关联信息
@@ -34,13 +34,13 @@ public interface SysRoleUserMenuMapper
      * @return 结果
      */
 
-    public int deleteRoleUserMenu(Long[] ids);
+    public int deleteUserMenu(Long[] ids);
 
     /**
      * 批量新增用户菜单信息
      * 
-     * @param roleUserMenuList 用户菜单列表
+     * @param userMenuList 用户菜单列表
      * @return 结果
      */
-    public int batchRoleUserMenu(List<SysRoleUserMenu> roleUserMenuList);
+    public int batchUserMenu(List<SyUserMenu> userMenuList);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.ruoyi.system.mapper.SysRoleUserMenuMapper;
+import com.ruoyi.system.mapper.SysUserMenuMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.constant.Constants;
@@ -47,8 +47,6 @@ public class SysMenuServiceImpl implements ISysMenuService
     private SysRoleMenuMapper roleMenuMapper;
 
 
-    @Autowired
-    private SysRoleUserMenuMapper roleUserMenuMapper;
 
     /**
      * 根据用户查询系统菜单列表

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -10,7 +10,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.SysPost;
-import com.ruoyi.system.domain.SysRoleUserMenu;
+import com.ruoyi.system.domain.SyUserMenu;
 import com.ruoyi.system.domain.SysUserPost;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.*;
@@ -62,7 +62,7 @@ public class SysUserServiceImpl implements ISysUserService
 
 
     @Autowired
-    private SysRoleUserMenuMapper roleUserMenuMapper;
+    private SysUserMenuMapper userMenuMapper;
 
     /**
      * 根据条件分页查询用户列表
@@ -266,7 +266,7 @@ public class SysUserServiceImpl implements ISysUserService
         // 新增用户与角色管理
         insertUserRole(user);
         //新增用户与菜单关联
-        insertRoleUserMenu(user);
+        insertUserMenu(user);
         return rows;
     }
 
@@ -302,8 +302,8 @@ public class SysUserServiceImpl implements ISysUserService
         // 新增用户与岗位管理
         insertUserPost(user);
         // 删除角色与菜单关联
-        roleUserMenuMapper.deleteRoleUserMenuByUserId(user.getUserId());
-        insertRoleUserMenu(user);
+        userMenuMapper.deleteUserMenuByUserId(user.getUserId());
+        insertUserMenu(user);
         return userMapper.updateUser(user);
     }
 
@@ -454,7 +454,7 @@ public class SysUserServiceImpl implements ISysUserService
         // 删除用户与岗位表
         userPostMapper.deleteUserPostByUserId(userId);
         // 删除用户与菜单
-        roleUserMenuMapper.deleteRoleUserMenuByUserId(userId);
+        userMenuMapper.deleteUserMenuByUserId(userId);
         return userMapper.deleteUserById(userId);
     }
 
@@ -557,23 +557,23 @@ public class SysUserServiceImpl implements ISysUserService
     /**
      * 新增角色菜单信息
      *
-     * @param role 角色对象
+     * @param SysUser 用户对象
      */
-    public int insertRoleUserMenu(SysUser user)
+    public int insertUserMenu(SysUser user)
     {
         int rows = 1;
         // 新增用户与角色管理
-        List<SysRoleUserMenu> list = new ArrayList<SysRoleUserMenu>();
+        List<SyUserMenu> list = new ArrayList<SyUserMenu>();
         for (Long menuId : user.getMenuIds())
         {
-            SysRoleUserMenu rm = new SysRoleUserMenu();
+            SyUserMenu rm = new SyUserMenu();
             rm.setUserId(user.getUserId());
             rm.setMenuId(menuId);
             list.add(rm);
         }
         if (list.size() > 0)
         {
-            rows = roleUserMenuMapper.batchRoleUserMenu(list);
+            rows = userMenuMapper.batchUserMenu(list);
         }
         return rows;
     }

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -103,10 +103,10 @@
 	<select id="selectUserMenuListByUserId" resultType="Long">
 		select m.menu_id
 		from sys_menu m
-		left join sys_role_user_menu rm on m.menu_id = rm.menu_id
+		left join sys_user_menu rm on m.menu_id = rm.menu_id
 		where rm.user_id = #{userId}
 <!--		<if test="menuCheckStrictly">-->
-<!--			and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_user_menu rm on m.menu_id = rm.menu_id and rm.user_id = #{userId})-->
+<!--			and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_user_menu rm on m.menu_id = rm.menu_id and rm.user_id = #{userId})-->
 <!--		</if>-->
 		order by m.parent_id, m.order_num
 	</select>

ruoyi-system/src/main/resources/mapper/system/SysRoleUserMenuMapper.xml

@@ -2,30 +2,30 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.SysRoleUserMenuMapper">
+<mapper namespace="com.ruoyi.system.mapper.SysUserMenuMapper">
 
-	<resultMap type="SysRoleUserMenu" id="SysRoleUserMenuResult">
+	<resultMap type="SyUserMenu" id="SysUserMenuResult">
 		<result property="userId"     column="user_id"      />
 		<result property="menuId"     column="menu_id"      />
 	</resultMap>
 	
 	<select id="checkUserMenuExistRole" resultType="Integer">
-	    select count(1) from sys_role_user_menu where menu_id = #{menuId}
+	    select count(1) from sys_user_menu where menu_id = #{menuId}
 	</select>
 
-	<delete id="deleteRoleUserMenuByUserId" parameterType="Long">
-		delete from sys_role_user_menu where user_id=#{userId}
+	<delete id="deleteUserMenuByUserId" parameterType="Long">
+		delete from sys_user_menu where user_id=#{userId}
 	</delete>
 	
-	<delete id="deleteRoleUserMenu" parameterType="Long">
- 		delete from sys_role_user_menu where userId in
+	<delete id="deleteUserMenu" parameterType="Long">
+ 		delete from sys_user_menu where userId in
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  			#{userId}
         </foreach> 
  	</delete>
 	
-	<insert id="batchRoleUserMenu">
-		insert into sys_role_user_menu(user_id, menu_id) values
+	<insert id="batchUserMenu">
+		insert into sys_user_menu(user_id, menu_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.userId},#{item.menuId})
 		</foreach>

ruoyi-ui/src/api/system/menu.js

@@ -35,9 +35,9 @@ export function roleMenuTreeselect(roleId) {
 
 
 // 根据用户ID查询菜单下拉树结构
-export function roleUserMenuTreeselect(userId) {
+export function userMenuTreeselect(userId) {
   return request({
-    url: '/system/menu/roleUserMenuTreeselect/' + userId,
+    url: '/system/menu/userMenuTreeselect/' + userId,
     method: 'get'
   })
 }

ruoyi-ui/src/views/system/user/index.vue

@@ -357,7 +357,7 @@
 
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
-import { treeselect as menuTreeselect, roleMenuTreeselect,roleUserMenuTreeselect } from "@/api/system/menu";
+import { treeselect as menuTreeselect, roleMenuTreeselect,userMenuTreeselect } from "@/api/system/menu";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -615,8 +615,8 @@ export default {
       return checkedKeys;
     },
     /** 根据用户ID查询菜单树结构 */
-    getRoleUserMenuTreeselect(userId) {
-      return roleUserMenuTreeselect(userId).then(response => {
+    getUserMenuTreeselect(userId) {
+      return userMenuTreeselect(userId).then(response => {
         this.menuOptions = response.menus;
         return response;
       });
@@ -625,7 +625,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const userId = row.userId || this.ids;
-      const userMenu = this.getRoleUserMenuTreeselect(userId);
+      const userMenu = this.getUserMenuTreeselect(userId);
       getUser(userId).then(response => {
         this.form = response.data;
         this.postOptions = response.posts;
@@ -643,6 +643,8 @@ export default {
             })
           });
         });
+        //响应无menuCheckStrictly字段，默认true
+        this.form.menuCheckStrictly=true;
         this.title = "修改用户";
         this.form.password = "";
       });