修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -589,7 +589,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             }
             if (!allProjectNew.isEmpty()){
                 headsecondList.add("项目工时分配");
-                for (int i = 1; i < allProjectNew.size()-1; i++) {
+                for (int i = 1; i <= allProjectNew.size()-1; i++) {
                     headsecondList.add("");
                 }
             }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/ExcelUtil.java

@@ -878,7 +878,10 @@ public class ExcelUtil {
                             sheetOne.addMergedRegion(new CellRangeAddress(0, 0, 4,index-1));
                         }
                         short lastCellNum = row0.getLastCellNum();
-                        sheetOne.addMergedRegion(new CellRangeAddress(0, 0, index,lastCellNum));
+                        if (index<lastCellNum-1){
+                            sheetOne.addMergedRegion(new CellRangeAddress(0, 0, index,lastCellNum-1));
+                        }
+
 
 
                     }