From dd63f9e1dcadf2ee9fbe7013726149d26d6446fb Mon Sep 17 00:00:00 2001 From: FCL Date: Mon, 22 Dec 2025 14:13:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ReportDocumentMainController.java | 2 ++ .../reportdoc/service/ReportDocumentAssistService.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java index 208b9b2..0e337ff 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java @@ -30,6 +30,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; +import lombok.extern.slf4j.Slf4j; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -46,6 +47,7 @@ import static com.zt.plat.module.qms.enums.ErrorCodeConstants.REPORT_DOCUMENT_TY @RestController @RequestMapping("/qms/report-document-main") @Validated +@Slf4j @FileUploadController(source = "qms.reportdocumentmain") public class ReportDocumentMainController extends AbstractFileUploadController implements BusinessControllerMarker{ diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentAssistService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentAssistService.java index 8a3d4f8..e640c08 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentAssistService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentAssistService.java @@ -120,7 +120,10 @@ public class ReportDocumentAssistService { String templateContent = templateDO.getFormContent(); JSONObject templateData = new JSONObject(); JSONArray tableList = data.getJSONArray(0); - templateData.put("headerData", tableList.getJSONObject(0).clone()); + JSONObject headerData = new JSONObject(); + if(tableList != null && !tableList.isEmpty()) + headerData = tableList.getJSONObject(0).clone(); + templateData.put("headerData", headerData); templateData.put("tableList", tableList); templateData.put("formData", mainDO.getFormData()); templateData.put("signatureData", mainDO.getDocumentSignature());