From 5e907c9fd4fd21827ed89aceae9ad920168c878c Mon Sep 17 00:00:00 2001 From: FCL Date: Wed, 11 Mar 2026 10:51:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A-=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E5=A4=84=E7=90=86=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 --- .../reportdoc/service/ReportDocumentDataServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 18cc2282..c5952968 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 @@ -294,6 +294,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService 铜精矿综合样：方法名显示为/ * */ private JSONObject assembleResultData(ReportDocumentMainDO mainData, JSONArray rows, ReportDocumentDataDO firstDataDO){ +// String emptyImgBase64 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAeCAIAAACubtl7AAAACXBIWXMAAA7EAAAOxAGVKw4bAAABF0lEQVQ4jWP8//8/A+mAiQw9g1jb32ebe2ec+kqitp+XV214LavMSZK2f+/2rbysE+4izESKtj/3Nmz85hqqxw4TIErb15OrjkgHecsww0WI0Pbv+fa1Dy3CrHmRxAhr+3V17Q5W3yBVFmRBQtr+vT+w8rxmqIsIqkIC2v4+3Ljho1OYIQeaOH5t30+vOiwW5CvLjC6BT9u/FzvW3DMNt+XDlMKj7ff19dsZvILVWbDI4db28dCqM6rhbqJYVeDS9vfh5vVvHUONOLFL49D24/zqA8IBvgoYYYFP27/Xu1beMgqz58ehCbu2P7fWbvvvGaTJilMXNm2fj6w6oxjiIYEvbjDl/n74rRwWYYojLKCAcbTAG1htAK4eXQ1h4qkRAAAAAElFTkSuQmCC"; String formData = mainData.getFormData(); String signatureData = mainData.getDocumentSignature(); String signatureJsonStr = assembleSignature(signatureData); @@ -301,8 +302,8 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService if(!ObjectUtils.isEmpty(formData)) formDataJson = JSONObject.parseObject(formData); JSONObject signatureJson = new JSONObject(); - if(!ObjectUtils.isEmpty(signatureData)) - signatureJson = JSONObject.parseObject(signatureData); + if(!ObjectUtils.isEmpty(signatureJsonStr)) + signatureJson = JSONObject.parseObject(signatureJsonStr); JSONObject resultData = new JSONObject(); JSONObject headerData = new JSONObject(); JSONObject firstRow = rows.getJSONObject(0); @@ -349,6 +350,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService opinion.replace("signTime", ""); opinion.replace("signatureId", ""); opinion.replace("userName", "/"); + opinion.replace("signatureIdBase64", ""); opinion.replace("userId", ""); } }