From 2a3d8dae93aacd81e3fc584526e8a9e41e25bc21 Mon Sep 17 00:00:00 2001
From: IT-xiaoXiong <774495953@qq.com>
Date: Thu, 18 Nov 2021 18:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6pdf?=
 =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weaver/aiyh_pcn/convert_pdf/ConvertPdfAction.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weaver/aiyh_pcn/convert_pdf/ConvertPdfAction.java b/weaver/aiyh_pcn/convert_pdf/ConvertPdfAction.java
index cdba8e2..24891cf 100644
--- a/weaver/aiyh_pcn/convert_pdf/ConvertPdfAction.java
+++ b/weaver/aiyh_pcn/convert_pdf/ConvertPdfAction.java
@@ -47,7 +47,7 @@ public class ConvertPdfAction implements Action {
 		}
 		if(StringUtils.isNullOrEmpty(mergeToField)){
 //			TODO 修改labelId
-			requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-10101,user.getLanguage(),"没有配置合并后PDF存放字段，请联系管理员！"));
+			requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-88650,user.getLanguage(),"没有配置合并后PDF存放字段，请联系管理员！"));
 			requestInfo.getRequestManager().setMessageid("1");
 			return Action.FAILURE_AND_CONTINUE;
 		}
@@ -108,7 +108,7 @@ public class ConvertPdfAction implements Action {
 		if(fileId <= 0){
 			toolUtil.writeErrorLog("文件合并错误！(-2:用户为空,-1:文档获取异常)、错误id：" + fileId);
 //			TODO 修改labelId
-			requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-10101,user.getLanguage(),"合并pdf错误，请联系管理员！"));
+			requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-88651,user.getLanguage(),"合并pdf错误，请联系管理员！"));
 			requestInfo.getRequestManager().setMessageid("1");
 			return Action.FAILURE_AND_CONTINUE;
 		}