ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update mybatis-plus 3.5.1 => 3.5.2 解决新版本兼容性问题 关键字冲突修改

2.X
疯狂的狮子li 2022-06-01 13:24:55 +08:00
parent 6ae481a96f
commit e1c789b947
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -22,7 +22,7 @@
<spring-boot-admin.version>2.6.7</spring-boot-admin.version> <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
<spring-boot.mybatis>2.2.2</spring-boot.mybatis> <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
<swagger.core.version>1.5.22</swagger.core.version> <swagger.core.version>1.5.22</swagger.core.version>
<mybatis-plus.version>3.5.1</mybatis-plus.version> <mybatis-plus.version>3.5.2</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version> <p6spy.version>3.9.1</p6spy.version>
<druid.version>1.2.9</druid.version> <druid.version>1.2.9</druid.version>
<dynamic-ds.version>3.5.1</dynamic-ds.version> <dynamic-ds.version>3.5.1</dynamic-ds.version>

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View File

@ -68,7 +68,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
.orderByAsc(SysMenu::getOrderNum)); .orderByAsc(SysMenu::getOrderNum));
} else { } else {
QueryWrapper<SysMenu> wrapper = Wrappers.query(); QueryWrapper<SysMenu> wrapper = Wrappers.query();
wrapper.eq("ur.user_id", userId) wrapper.eq("sur.user_id", userId)
.like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName()) .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName())
.eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible()) .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible())
.eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus()) .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus())

18
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
View File

@ -32,8 +32,8 @@
m.perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time m.perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
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 sur on rm.role_id = sur.role_id
left join sys_role ro on ur.role_id = ro.role_id left join sys_role ro on sur.role_id = ro.role_id
${ew.getCustomSqlSegment} ${ew.getCustomSqlSegment}
</select> </select>
@ -55,9 +55,9 @@
m.create_time m.create_time
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 sur on rm.role_id = sur.role_id
left join sys_role ro on ur.role_id = ro.role_id left join sys_role ro on sur.role_id = ro.role_id
left join sys_user u on ur.user_id = u.user_id left join sys_user u on sur.user_id = u.user_id
where u.user_id = #{userId} where u.user_id = #{userId}
and m.menu_type in ('M', 'C') and m.menu_type in ('M', 'C')
and m.status = '0' and m.status = '0'
@ -80,16 +80,16 @@
select distinct m.perms select distinct m.perms
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 sur on rm.role_id = sur.role_id
</select> </select>
<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String"> <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
select distinct m.perms select distinct m.perms
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 sur on rm.role_id = sur.role_id
left join sys_role r on r.role_id = ur.role_id left join sys_role r on r.role_id = sur.role_id
where m.status = '0' and r.status = '0' and ur.user_id = #{userId} where m.status = '0' and r.status = '0' and sur.user_id = #{userId}
</select> </select>
</mapper> </mapper>

10
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
View File

@ -34,8 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
r.create_time, r.create_time,
r.remark r.remark
from sys_role r from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id left join sys_user_role sur on sur.role_id = r.role_id
left join sys_user u on u.user_id = ur.user_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 left join sys_dept d on u.dept_id = d.dept_id
</sql> </sql>
@ -51,15 +51,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult"> <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
<include refid="selectRoleVo"/> <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>
<select id="selectRoleListByUserId" parameterType="Long" resultType="Long"> <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
select r.role_id select r.role_id
from sys_role r from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id left join sys_user_role sur on sur.role_id = r.role_id
left join sys_user u on u.user_id = ur.user_id left join sys_user u on u.user_id = sur.user_id
where u.user_id = #{userId} where u.user_id = #{userId}
</select> </select>

12
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -80,8 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
r.status as role_status r.status as role_status
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = ur.role_id left join sys_role r on r.role_id = sur.role_id
</sql> </sql>
<select id="selectPageUserList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectPageUserList" parameterType="SysUser" resultMap="SysUserResult">
@ -102,8 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = ur.role_id left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment} ${ew.getCustomSqlSegment}
</select> </select>
@ -111,8 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = ur.role_id left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment} ${ew.getCustomSqlSegment}
</select> </select>

4
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
View File

@ -11,8 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectUserIdsByRoleId" resultType="Long"> <select id="selectUserIdsByRoleId" resultType="Long">
select u.user_id from sys_user u select u.user_id from sys_user u
inner join sys_user_role ur inner join sys_user_role sur
on u.user_id = ur.user_id and ur.role_id = #{roleId} on u.user_id = sur.user_id and sur.role_id = #{roleId}
</select> </select>
</mapper> </mapper>