add 新增 easyexcel 单元格合并注解与处理器

疯狂的狮子li

2022-05-31 f6fa17a3a817f8cc1743cb881aa9927227ed2867

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

@@ -123,7 +123,7 @@
    @Override
    public List<Long> selectMenuListByRoleId(Long roleId) {
        SysRole role = roleMapper.selectById(roleId);
        return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly() == 1);
        return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly());
    }

    /**