diff --git a/src/main/java/com/peanut/modules/master/controller/UserContributionController.java b/src/main/java/com/peanut/modules/master/controller/UserContributionController.java index 7b3612c1..d7ffaa4c 100644 --- a/src/main/java/com/peanut/modules/master/controller/UserContributionController.java +++ b/src/main/java/com/peanut/modules/master/controller/UserContributionController.java @@ -250,12 +250,14 @@ public class UserContributionController { i++; } // 合并单元格 - sheet.addMergedRegion(new CellRangeAddress(startI, i+1, 0, 0)); - sheet.addMergedRegion(new CellRangeAddress(startI, i+1, 1, 1)); - sheet.addMergedRegion(new CellRangeAddress(startI, i+1, 2, 2)); - sheet.addMergedRegion(new CellRangeAddress(startI, i+1, 3, 3)); - sheet.addMergedRegion(new CellRangeAddress(startI, i+1, 4, 4)); - startI = i+2; + if(startI!=i-1){ + sheet.addMergedRegion(new CellRangeAddress(startI, i-1, 0, 0)); + sheet.addMergedRegion(new CellRangeAddress(startI, i-1, 1, 1)); + sheet.addMergedRegion(new CellRangeAddress(startI, i-1, 2, 2)); + sheet.addMergedRegion(new CellRangeAddress(startI, i-1, 3, 3)); + sheet.addMergedRegion(new CellRangeAddress(startI, i-1, 4, 4)); + } + startI = i; no++; } workbook.write(outputStream);