From 91815c5e84b30bd70bafcb48a2f3f73db271ebbd Mon Sep 17 00:00:00 2001 From: FCL Date: Fri, 26 Dec 2025 10:49:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=84=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ReportDocumentDataServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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);