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

2022-12-05 17:59:58 +08:00 · 2022-12-05 17:59:58 +08:00 · f70951d374
commit f70951d374
parent 9ebe1ae918
1 changed files with 1 additions and 1 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java
@ -86,7 +86,7 @@ public class CellMergeStrategy extends AbstractMergeStrategy {
 						// 空值跳过不合并
 						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));
 						}