Merge remote-tracking branch 'origin/dev' into dev

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -58,6 +58,6 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu> {
      * @param menuCheckStrictly 菜单树选择项是否关联显示
      * @return 选中菜单列表
      */
-    List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
+    List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

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

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

@@ -114,7 +114,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 选中菜单列表
      */
     @Override
-    public List<Integer> selectMenuListByRoleId(Long roleId) {
+    public List<Long> selectMenuListByRoleId(Long roleId) {
         SysRole role = roleMapper.selectById(roleId);
         return baseMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
     }

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -117,7 +117,7 @@
         order by m.parent_id, m.order_num
     </select>
 
-    <select id="selectMenuListByRoleId" resultType="Integer">
+    <select id="selectMenuListByRoleId" resultType="Long">
         select m.menu_id
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -147,4 +147,4 @@
           and ur.user_id = #{userId}
     </select>
 
-</mapper> 
+</mapper>