优化多角色数据权限匹配规则

RuoYi

2022-08-21 9b3767a954baba7bc62dd74f75c63c693eac4a2c

 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -993,7 +993,7 @@
            {

                // 创建cell

                cell = row.createCell(column);

                if (isSubListValue(vo) && attr.needMerge())

                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())

                {

                    CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);

                    sheet.addMergedRegion(cellAddress);