admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!260 单元格合并判断cellValue是否相等方法调整

Browse Source 
Merge pull request !260 from zendwang/dev
This commit is contained in:
疯狂的狮子Li 2022-12-06 03:32:35 +00:00 committed by Gitee
commit b38151a0bb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java
View File

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