diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java index c984d91..07f2a27 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java @@ -273,7 +273,7 @@ //执行单元格行合并 doMergeCell(table, startRowIndex, endRowIndex, currentColIndex); //递归到下一列进行判断 - recursiveMergeCell(endRowIndex, currentColIndex + 1, startRowIndex, maxRowIndex, table, mergeIndexMap); + recursiveMergeCell(maxColIndex, currentColIndex + 1, startRowIndex, endRowIndex+1, table, mergeIndexMap); } //继续判断合并以后的行数,是否满足最后的大查询 startRowIndex = endRowIndex + 1;