试验excel标题

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -3564,12 +3564,25 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
         //标题Title
         ProjectInfo projectInfo = projectInfoService.getById(wbsTreePrivate.getProjectId());
-        int all = sheet.getRow(0).getLastCellNum();
         int mergedCellCnt = sheet.getNumMergedRegions();
-        for (int i = 0; i < mergedCellCnt - 1; i++) {
+        int all = 0;
+        List<CellRangeAddress> mergedRegions = sheet.getMergedRegions();
+        int xle = 10;
+        if (mergedRegions.size() <= 10) {
+            xle = mergedRegions.size();
+        }
+        for (int i = 0; i < xle; i++) {
             CellRangeAddress mergedCell = sheet.getMergedRegion(i);
             int xx = mergedCell.getLastColumn();
-            if (xx <= all) {
+            if (xx >= all) {
+                all = xx;
+            }
+        }
+
+        for (int i = 0; i < mergedCellCnt - 1; i++) {
+            CellRangeAddress mergedCell = sheet.getMergedRegion(i);
+            int xx = mergedCell.getLastColumn() + 2;
+            if (xx >= all){
                 int fisRow = mergedCell.getFirstRow();
                 int firstCol = mergedCell.getFirstColumn();
                 Cell cell = sheet.getRow(fisRow).getCell(firstCol);