From a0c93cb2a9bba9179d9fd24c52039451d56acb7f Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Sun, 6 Oct 2024 09:48:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/SysLoginController.java | 2 +- .../java/com/ruoyi/system/domain/SysUserRole.java | 2 +- .../main/resources/mapper/system/SysMenuMapper.xml | 8 ++++---- .../main/resources/mapper/system/SysRoleMapper.xml | 4 ++-- .../resources/mapper/system/SysUserRoleMapper.xml | 12 ++++++------ 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ridelease-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ridelease-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index eacb581..245b64d 100644 --- a/ridelease-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ridelease-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -60,7 +60,7 @@ public class SysLoginController * @param userId 用户id * @return 结果 */ - @PostMapping("/getToken") + @GetMapping("/getToken") public AjaxResult getToken(Long userId) { AjaxResult ajax = AjaxResult.success(); diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java index 26121c5..8ae6d0c 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java @@ -4,7 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; /** - * 用户和角色关联 rl_user_role + * 用户和角色关联 sys_user_role * * @author ruoyi */ diff --git a/ridelease-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ridelease-system/src/main/resources/mapper/system/SysMenuMapper.xml index f6b3bde..9706793 100644 --- a/ridelease-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ridelease-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -59,7 +59,7 @@ 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 rl_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 where ur.user_id = #{params.userId} @@ -78,7 +78,7 @@ 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 rl_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 rl_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 @@ -100,14 +100,14 @@ select distinct m.perms from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id - left join rl_user_role ur on rm.role_id = ur.role_id + left join sys_user_role ur on rm.role_id = ur.role_id diff --git a/ridelease-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ridelease-system/src/main/resources/mapper/system/SysRoleMapper.xml index 3282ecd..897a0ca 100644 --- a/ridelease-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ridelease-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, r.status, r.del_flag, r.create_time, r.remark from sys_role r - left join rl_user_role ur on ur.role_id = r.role_id + left join sys_user_role ur on ur.role_id = r.role_id left join rl_user u on u.user_id = ur.user_id left join sys_dept d on u.dept_id = d.dept_id @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ridelease-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ridelease-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index 2d72caa..f0264d7 100644 --- a/ridelease-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/ridelease-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -10,33 +10,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from rl_user_role where user_id=#{userId}RlUserRole + delete from sys_user_role where user_id=#{userId}RlUserRole - delete from rl_user_role where user_id in + delete from sys_user_role where user_id in #{userId} - insert into rl_user_role(user_id, role_id) values + insert into sys_user_role(user_id, role_id) values (#{item.userId},#{item.roleId}) - delete from rl_user_role where user_id=#{userId} and role_id=#{roleId} + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} - delete from rl_user_role where role_id=#{roleId} and user_id in + delete from sys_user_role where role_id=#{roleId} and user_id in #{userId}