提交者
Gitee
!381 fix 修复主键溢出问题 将查询返回类型改为 Long
Merge pull request !381 from 疯狂的狮子Li/fix
正在显示
12 个修改的文件
包含
12 行增加
和
12 行删除
| @@ -26,7 +26,7 @@ public interface SysDeptMapper | @@ -26,7 +26,7 @@ public interface SysDeptMapper | ||
| 26 | * @param deptCheckStrictly 部门树选择项是否关联显示 | 26 | * @param deptCheckStrictly 部门树选择项是否关联显示 |
| 27 | * @return 选中部门列表 | 27 | * @return 选中部门列表 |
| 28 | */ | 28 | */ |
| 29 | - public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); | 29 | + public List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * 根据部门ID查询信息 | 32 | * 根据部门ID查询信息 |
| @@ -64,7 +64,7 @@ public interface SysMenuMapper | @@ -64,7 +64,7 @@ public interface SysMenuMapper | ||
| 64 | * @param menuCheckStrictly 菜单树选择项是否关联显示 | 64 | * @param menuCheckStrictly 菜单树选择项是否关联显示 |
| 65 | * @return 选中菜单列表 | 65 | * @return 选中菜单列表 |
| 66 | */ | 66 | */ |
| 67 | - public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); | 67 | + public List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); |
| 68 | 68 | ||
| 69 | /** | 69 | /** |
| 70 | * 根据菜单ID查询信息 | 70 | * 根据菜单ID查询信息 |
| @@ -39,7 +39,7 @@ public interface SysPostMapper | @@ -39,7 +39,7 @@ public interface SysPostMapper | ||
| 39 | * @param userId 用户ID | 39 | * @param userId 用户ID |
| 40 | * @return 选中岗位ID列表 | 40 | * @return 选中岗位ID列表 |
| 41 | */ | 41 | */ |
| 42 | - public List<Integer> selectPostListByUserId(Long userId); | 42 | + public List<Long> selectPostListByUserId(Long userId); |
| 43 | 43 | ||
| 44 | /** | 44 | /** |
| 45 | * 查询用户所属岗位组 | 45 | * 查询用户所属岗位组 |
| @@ -41,7 +41,7 @@ public interface ISysDeptService | @@ -41,7 +41,7 @@ public interface ISysDeptService | ||
| 41 | * @param roleId 角色ID | 41 | * @param roleId 角色ID |
| 42 | * @return 选中部门列表 | 42 | * @return 选中部门列表 |
| 43 | */ | 43 | */ |
| 44 | - public List<Integer> selectDeptListByRoleId(Long roleId); | 44 | + public List<Long> selectDeptListByRoleId(Long roleId); |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 根据部门ID查询信息 | 47 | * 根据部门ID查询信息 |
| @@ -52,7 +52,7 @@ public interface ISysMenuService | @@ -52,7 +52,7 @@ public interface ISysMenuService | ||
| 52 | * @param roleId 角色ID | 52 | * @param roleId 角色ID |
| 53 | * @return 选中菜单列表 | 53 | * @return 选中菜单列表 |
| 54 | */ | 54 | */ |
| 55 | - public List<Integer> selectMenuListByRoleId(Long roleId); | 55 | + public List<Long> selectMenuListByRoleId(Long roleId); |
| 56 | 56 | ||
| 57 | /** | 57 | /** |
| 58 | * 构建前端路由所需要的菜单 | 58 | * 构建前端路由所需要的菜单 |
| @@ -39,7 +39,7 @@ public interface ISysPostService | @@ -39,7 +39,7 @@ public interface ISysPostService | ||
| 39 | * @param userId 用户ID | 39 | * @param userId 用户ID |
| 40 | * @return 选中岗位ID列表 | 40 | * @return 选中岗位ID列表 |
| 41 | */ | 41 | */ |
| 42 | - public List<Integer> selectPostListByUserId(Long userId); | 42 | + public List<Long> selectPostListByUserId(Long userId); |
| 43 | 43 | ||
| 44 | /** | 44 | /** |
| 45 | * 校验岗位名称 | 45 | * 校验岗位名称 |
| @@ -100,7 +100,7 @@ public class SysDeptServiceImpl implements ISysDeptService | @@ -100,7 +100,7 @@ public class SysDeptServiceImpl implements ISysDeptService | ||
| 100 | * @return 选中部门列表 | 100 | * @return 选中部门列表 |
| 101 | */ | 101 | */ |
| 102 | @Override | 102 | @Override |
| 103 | - public List<Integer> selectDeptListByRoleId(Long roleId) | 103 | + public List<Long> selectDeptListByRoleId(Long roleId) |
| 104 | { | 104 | { |
| 105 | SysRole role = roleMapper.selectRoleById(roleId); | 105 | SysRole role = roleMapper.selectRoleById(roleId); |
| 106 | return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); | 106 | return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); |
| @@ -128,7 +128,7 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -128,7 +128,7 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 128 | * @return 选中菜单列表 | 128 | * @return 选中菜单列表 |
| 129 | */ | 129 | */ |
| 130 | @Override | 130 | @Override |
| 131 | - public List<Integer> selectMenuListByRoleId(Long roleId) | 131 | + public List<Long> selectMenuListByRoleId(Long roleId) |
| 132 | { | 132 | { |
| 133 | SysRole role = roleMapper.selectRoleById(roleId); | 133 | SysRole role = roleMapper.selectRoleById(roleId); |
| 134 | return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); | 134 | return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); |
| @@ -67,7 +67,7 @@ public class SysPostServiceImpl implements ISysPostService | @@ -67,7 +67,7 @@ public class SysPostServiceImpl implements ISysPostService | ||
| 67 | * @return 选中岗位ID列表 | 67 | * @return 选中岗位ID列表 |
| 68 | */ | 68 | */ |
| 69 | @Override | 69 | @Override |
| 70 | - public List<Integer> selectPostListByUserId(Long userId) | 70 | + public List<Long> selectPostListByUserId(Long userId) |
| 71 | { | 71 | { |
| 72 | return postMapper.selectPostListByUserId(userId); | 72 | return postMapper.selectPostListByUserId(userId); |
| 73 | } | 73 | } |
| @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 47 | order by d.parent_id, d.order_num | 47 | order by d.parent_id, d.order_num |
| 48 | </select> | 48 | </select> |
| 49 | 49 | ||
| 50 | - <select id="selectDeptListByRoleId" resultType="Integer"> | 50 | + <select id="selectDeptListByRoleId" resultType="Long"> |
| 51 | select d.dept_id | 51 | select d.dept_id |
| 52 | from sys_dept d | 52 | from sys_dept d |
| 53 | left join sys_role_dept rd on d.dept_id = rd.dept_id | 53 | left join sys_role_dept rd on d.dept_id = rd.dept_id |
| @@ -84,7 +84,7 @@ | @@ -84,7 +84,7 @@ | ||
| 84 | order by m.parent_id, m.order_num | 84 | order by m.parent_id, m.order_num |
| 85 | </select> | 85 | </select> |
| 86 | 86 | ||
| 87 | - <select id="selectMenuListByRoleId" resultType="Integer"> | 87 | + <select id="selectMenuListByRoleId" resultType="Long"> |
| 88 | select m.menu_id | 88 | select m.menu_id |
| 89 | from sys_menu m | 89 | from sys_menu m |
| 90 | left join sys_role_menu rm on m.menu_id = rm.menu_id | 90 | left join sys_role_menu rm on m.menu_id = rm.menu_id |
| @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 46 | where post_id = #{postId} | 46 | where post_id = #{postId} |
| 47 | </select> | 47 | </select> |
| 48 | 48 | ||
| 49 | - <select id="selectPostListByUserId" parameterType="Long" resultType="Integer"> | 49 | + <select id="selectPostListByUserId" parameterType="Long" resultType="Long"> |
| 50 | select p.post_id | 50 | select p.post_id |
| 51 | from sys_post p | 51 | from sys_post p |
| 52 | left join sys_user_post up on up.post_id = p.post_id | 52 | left join sys_user_post up on up.post_id = p.post_id |
-
请 注册 或 登录 后发表评论