!260 单元格合并判断cellValue是否相等方法调整 Merge pull request !260 from zendwang/dev

疯狂的狮子Li

2022-12-06 b38151a0bb0484221ba7b9ad3a1aa773105e1b14

!260 单元格合并判断cellValue是否相等方法调整
Merge pull request !260 from zendwang/dev

 ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java

@@ -86,7 +86,7 @@
                        // 空值跳过不合并
                        continue;
                    }
                    if (cellValue != val) {
                    if (!cellValue.equals(val)) {
                        if (i - repeatCell.getCurrent() > 1) {
                            cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum));
                        }