From cad7706a17a010513ca1c53a3e0207c0a9cbc3aa Mon Sep 17 00:00:00 2001
From: IT-xiaoXiong <774495953@qq.com>
Date: Thu, 2 Dec 2021 23:02:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E6=B7=BB=E5=8A=A0=E7=9A=84=E9=80=BB=E8=BE=91=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=8C=E5=8F=AA=E6=9C=89=E7=AC=AC=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9A=84=E6=97=B6=E5=80=99=E6=89=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java b/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java
index 4dac9e8..c39f384 100644
--- a/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java
+++ b/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java
@@ -52,7 +52,7 @@ public class CopyAttachmentSecretAction extends ToolUtil implements Action {
 			Map<String, Object> requestData = Util.recordSet2Map(rs_1);
 			toolUtil.writeDebuggerLog(requestData.toString());
 //			如果不是第一次添加，则直接返回 TODO 隐藏bug，如果用户第一次选择添加，后面被退回后，将附件清空了，重新上传，然后又需要安全协议，但是已经不是第一次添加了，所以并不会生效
-			if(!Util.null2String(firstAddValue).equals(String.valueOf(requestData.get(firstAddField)))){
+			if(requestData.get(firstAddField) != null && !Util.null2String(firstAddValue).equals(String.valueOf(requestData.get(firstAddField)))){
 				return Action.SUCCESS;
 			}
 //		查询配置表，获取配置数据