diff --git a/src/main/java/neatlogic/module/autoexec/script/paramtype/ScriptParamTypePassword.java b/src/main/java/neatlogic/module/autoexec/script/paramtype/ScriptParamTypePassword.java
index eb7d00339737a3d7fdad80cc4fb074f52170fdde..29cd80301432a0718c08becfae4aac58c65eae79 100644
--- a/src/main/java/neatlogic/module/autoexec/script/paramtype/ScriptParamTypePassword.java
+++ b/src/main/java/neatlogic/module/autoexec/script/paramtype/ScriptParamTypePassword.java
@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.autoexec.constvalue.ParamType;
 import neatlogic.framework.autoexec.script.paramtype.ScriptParamTypeBase;
 import neatlogic.framework.common.util.RC4Util;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -88,7 +89,10 @@ public class ScriptParamTypePassword extends ScriptParamTypeBase {
     @Override
     protected Object getMyTextByValue(Object value, JSONObject config) {
         String valueStr = value.toString();
-        return RC4Util.encrypt(valueStr);
+        if (StringUtils.isNotBlank(valueStr)) {
+            return RC4Util.encrypt(valueStr);
+        }
+        return value;
     }
 
     @Override
diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java
index 55c5d92675addbdf3a55ec496f42442039df3336..6a33fd1d5df1109b0886d66d2ca894525c9e49a7 100644
--- a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java
+++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java
@@ -1457,9 +1457,11 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex
                 if (paramVo == null) {
                     continue;
                 }
-                Object value = paramVo.getDefaultValue();
-                if (value != null && Objects.equals(paramVo.getType(), ParamType.PASSWORD.getValue())) {
-                    paramVo.setDefaultValue(RC4Util.encrypt((String) value));
+                if (paramVo.getDefaultValue() != null && Objects.equals(paramVo.getType(), ParamType.PASSWORD.getValue())) {
+                    String value = paramVo.getDefaultValue().toString();
+                    if (StringUtils.isNotBlank(value)) {
+                        paramVo.setDefaultValue(RC4Util.encrypt(value));
+                    }
                 }
             }
         }
@@ -1480,8 +1482,13 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex
                 List<ParamMappingVo> paramMappingList = operationConfig.getParamMappingList();
                 if (CollectionUtils.isNotEmpty(paramMappingList)) {
                     for (ParamMappingVo paramMappingVo : paramMappingList) {
-                        if (Objects.equals(paramMappingVo.getType(), ParamType.PASSWORD.getValue()) && paramMappingVo.getValue() != null && Objects.equals(paramMappingVo.getMappingMode(), ParamMappingMode.CONSTANT.getValue())) {
-                            paramMappingVo.setValue(RC4Util.encrypt((String) paramMappingVo.getValue()));
+                        if (Objects.equals(paramMappingVo.getType(), ParamType.PASSWORD.getValue())
+                                && paramMappingVo.getValue() != null
+                                && Objects.equals(paramMappingVo.getMappingMode(), ParamMappingMode.CONSTANT.getValue())) {
+                            String value = paramMappingVo.getValue().toString();
+                            if (StringUtils.isNotBlank(value)) {
+                                paramMappingVo.setValue(RC4Util.encrypt(value));
+                            }
                         }
                     }
                 }
diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecProfileServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecProfileServiceImpl.java
index 3d04f2835b95a2c1bd199d0610acb2fd4c473d37..0f4d517c6940d90f8246f6f3b13fa1f9ed621bcc 100644
--- a/src/main/java/neatlogic/module/autoexec/service/AutoexecProfileServiceImpl.java
+++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecProfileServiceImpl.java
@@ -202,7 +202,7 @@ public class AutoexecProfileServiceImpl implements AutoexecProfileService, IAuto
                 //获取引用的全局参数值
                 AutoexecGlobalParamVo globalParamVo = autoexecGlobalParamMapper.getGlobalParamByKey(paramVo.getDefaultValueStr());
                 if (globalParamVo != null) {
-                    if (StringUtils.equals(AutoexecGlobalParamType.PASSWORD.getValue(), globalParamVo.getType()) && globalParamVo.getDefaultValue() != null) {
+                    if (StringUtils.equals(AutoexecGlobalParamType.PASSWORD.getValue(), globalParamVo.getType()) && StringUtils.isNotBlank(globalParamVo.getDefaultValueStr())) {
                         String pwd = RC4Util.encrypt(globalParamVo.getDefaultValueStr());
                         paramVo.setDefaultValue(pwd);
                     } else {