From 9037a27cb83230fba02a24431dda5e32f4b13021 Mon Sep 17 00:00:00 2001 From: FCL Date: Wed, 19 Nov 2025 18:09:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportdoc/service/ReportDocumentDataServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 e748bf9..356bf06 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 @@ -87,6 +87,8 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService for(ReportDocumentDataDO dataDO : dataList){ String documentContent = dataDO.getDocumentContent(); JSONObject dataJson = JSONObject.parseObject(documentContent); + if(dataJson == null) + continue; if(dataJson.containsKey(field)){ if(!hasFields.contains( fieldName)){ fieldList.add(fieldDO); @@ -404,6 +406,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService String sampleName = dataDO.getSampleName(); String sampleCode = dataDO.getSampleCode(); String sampleNameCode = sampleName + " " + sampleCode; + t.put("id", dataDO.getId()); t.put("sampleNameCode", sampleNameCode); t.put("sampleName", sampleName); t.put("sampleCode", sampleCode);