liwei/crops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!381 fix 修复主键溢出问题 将查询返回类型改为 Long

Browse Source 
Merge pull request !381 from 疯狂的狮子Li/fix
This commit is contained in:
若依
2021-12-06 12:34:52 +00:00
committed by Gitee
parent 2c3f1c28e5 965ebd0f03
commit 836017f2b9
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
View File

@@ -26,7 +26,7 @@ public interface SysDeptMapper
* @param deptCheckStrictly 部门树选择项是否关联显示 * @param deptCheckStrictly 部门树选择项是否关联显示
* @return 选中部门列表 * @return 选中部门列表
*/ */
public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); public List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
/** /**
* 根据部门ID查询信息 * 根据部门ID查询信息

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
View File

@@ -64,7 +64,7 @@ public interface SysMenuMapper
* @param menuCheckStrictly 菜单树选择项是否关联显示 * @param menuCheckStrictly 菜单树选择项是否关联显示
* @return 选中菜单列表 * @return 选中菜单列表
*/ */
public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); public List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
/** /**
* 根据菜单ID查询信息 * 根据菜单ID查询信息

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
View File

@@ -39,7 +39,7 @@ public interface SysPostMapper
* @param userId 用户ID * @param userId 用户ID
* @return 选中岗位ID列表 * @return 选中岗位ID列表
*/ */
public List<Integer> selectPostListByUserId(Long userId); public List<Long> selectPostListByUserId(Long userId);
/** /**
* 查询用户所属岗位组 * 查询用户所属岗位组

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
View File

@@ -41,7 +41,7 @@ public interface ISysDeptService
* @param roleId 角色ID * @param roleId 角色ID
* @return 选中部门列表 * @return 选中部门列表
*/ */
public List<Integer> selectDeptListByRoleId(Long roleId); public List<Long> selectDeptListByRoleId(Long roleId);
/** /**
* 根据部门ID查询信息 * 根据部门ID查询信息

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
View File

@@ -52,7 +52,7 @@ public interface ISysMenuService
* @param roleId 角色ID * @param roleId 角色ID
* @return 选中菜单列表 * @return 选中菜单列表
*/ */
public List<Integer> selectMenuListByRoleId(Long roleId); public List<Long> selectMenuListByRoleId(Long roleId);
/** /**
* 构建前端路由所需要的菜单 * 构建前端路由所需要的菜单

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
View File

@@ -39,7 +39,7 @@ public interface ISysPostService
* @param userId 用户ID * @param userId 用户ID
* @return 选中岗位ID列表 * @return 选中岗位ID列表
*/ */
public List<Integer> selectPostListByUserId(Long userId); public List<Long> selectPostListByUserId(Long userId);
/** /**
* 校验岗位名称 * 校验岗位名称

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

@@ -100,7 +100,7 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 选中部门列表 * @return 选中部门列表
*/ */
@Override @Override
public List<Integer> selectDeptListByRoleId(Long roleId) public List<Long> selectDeptListByRoleId(Long roleId)
{ {
SysRole role = roleMapper.selectRoleById(roleId); SysRole role = roleMapper.selectRoleById(roleId);
return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());

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

@@ -128,7 +128,7 @@ public class SysMenuServiceImpl implements ISysMenuService
* @return 选中菜单列表 * @return 选中菜单列表
*/ */
@Override @Override
public List<Integer> selectMenuListByRoleId(Long roleId) public List<Long> selectMenuListByRoleId(Long roleId)
{ {
SysRole role = roleMapper.selectRoleById(roleId); SysRole role = roleMapper.selectRoleById(roleId);
return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());

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

@@ -67,7 +67,7 @@ public class SysPostServiceImpl implements ISysPostService
* @return 选中岗位ID列表 * @return 选中岗位ID列表
*/ */
@Override @Override
public List<Integer> selectPostListByUserId(Long userId) public List<Long> selectPostListByUserId(Long userId)
{ {
return postMapper.selectPostListByUserId(userId); return postMapper.selectPostListByUserId(userId);
} }

2
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by d.parent_id, d.order_num order by d.parent_id, d.order_num
</select> </select>
<select id="selectDeptListByRoleId" resultType="Integer"> <select id="selectDeptListByRoleId" resultType="Long">
select d.dept_id select d.dept_id
from sys_dept d from sys_dept d
left join sys_role_dept rd on d.dept_id = rd.dept_id left join sys_role_dept rd on d.dept_id = rd.dept_id

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

@@ -84,7 +84,7 @@
order by m.parent_id, m.order_num order by m.parent_id, m.order_num
</select> </select>
<select id="selectMenuListByRoleId" resultType="Integer"> <select id="selectMenuListByRoleId" resultType="Long">
select m.menu_id select m.menu_id
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

2
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
View File

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where post_id = #{postId} where post_id = #{postId}
</select> </select>
<select id="selectPostListByUserId" parameterType="Long" resultType="Integer"> <select id="selectPostListByUserId" parameterType="Long" resultType="Long">
select p.post_id select p.post_id
from sys_post p from sys_post p
left join sys_user_post up on up.post_id = p.post_id left join sys_user_post up on up.post_id = p.post_id