From da0c86dd546e8f4f8e6083a008920278da90b661 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 01 六月 2022 13:06:42 +0800
Subject: [PATCH] update mybatis-plus 3.5.1 => 3.5.2 解决新版本兼容性问题 关键字冲突修改

---
 ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index dc54c7e..90dff50 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -34,8 +34,8 @@
                         r.create_time,
                         r.remark
         from sys_role r
-                 left join sys_user_role ur on ur.role_id = r.role_id
-                 left join sys_user u on u.user_id = ur.user_id
+                 left join sys_user_role sur on sur.role_id = r.role_id
+                 left join sys_user u on u.user_id = sur.user_id
                  left join sys_dept d on u.dept_id = d.dept_id
     </sql>
 
@@ -51,14 +51,14 @@
 
     <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
-        WHERE r.del_flag = '0' and ur.user_id = #{userId}
+        WHERE r.del_flag = '0' and sur.user_id = #{userId}
     </select>
 
     <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
         select r.role_id
         from sys_role r
-                 left join sys_user_role ur on ur.role_id = r.role_id
-                 left join sys_user u on u.user_id = ur.user_id
+                 left join sys_user_role sur on sur.role_id = r.role_id
+                 left join sys_user u on u.user_id = sur.user_id
         where u.user_id = #{userId}
     </select>
 

--
Gitblit v1.9.3