Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/ReportServiceImpl.java

@@ -879,7 +879,9 @@ public class ReportServiceImpl extends BaseServiceImpl<ReportMapper, Report> imp
                         }else if (j == 13) {
                             str = " 处理图片";
                             cell.add(new Paragraph(str, font));
-                            cell.setRowspan(imgHanders.length);
+                            if(imgHanders.length > 0){
+                                cell.setRowspan(imgHanders.length);
+                            }
                         }else if (j >= 14) {
                             Image image = null;
                             if (new UrlResource(imgHanders[j-14]).exists()) {