opensource/RuoYi-Vue-Plus
2
0
Fork 2
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-22 02:50:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

解决后续合并值不一致也误合并问题

Browse Source
This commit is contained in:
Simple 2023-12-08 12:04:06 +08:00
parent 3e85520c0f
commit e9bf70cb34
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java
View File

@ -104,6 +104,12 @@ public class CellMergeStrategy extends AbstractMergeStrategy {
cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex, colNum, colNum)); cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex, colNum, colNum));
} }
} }
} else {
if (!cellValue.equals(val)) {
if (i - repeatCell.getCurrent() > 1) {
cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum));
}
map.put(field, new RepeatCell(val, i));
} else { } else {
RepeatCell firstCell = map.get(mergeFields.get(0)); RepeatCell firstCell = map.get(mergeFields.get(0));
if (repeatCell.getCurrent() != firstCell.getCurrent()) { if (repeatCell.getCurrent() != firstCell.getCurrent()) {
@ -120,6 +126,7 @@ public class CellMergeStrategy extends AbstractMergeStrategy {
} }
} }
} }
}
return cellList; return cellList;
} }