diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java index 24246ae..1db1f8d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java @@ -236,8 +236,19 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService } if(!remainingRows.isEmpty()){ JSONObject firstRemainingRow = remainingRows.getJSONObject(0); - if(!rowTypeTitle.equals(firstRemainingRow.getString(rowTypeKey))){ + String val01 = firstRemainingRow.getString(colPrefix + "01"); + if(!ObjectUtils.isEmpty(val01) && !" ".equals(val01) && !rowTypeTitle.equals(firstRemainingRow.getString(rowTypeKey))){ + //如果下一页的第一行不为空,且不是标题行,则插入标题 remainingRows.add(0, lastTitleRow); + }else{ + //如果下一页的第一行为空,则删除空行 + while (ObjectUtils.isEmpty(val01) || " ".equals(val01)){ + remainingRows.remove(0); + if(remainingRows.isEmpty()) + break; + firstRemainingRow = remainingRows.getJSONObject(0); + val01 = firstRemainingRow.getString(colPrefix + "01"); + } } } pageRowList.add(pageRow);