diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java
index a66128d..7428279 100644
--- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java
@@ -1,5 +1,6 @@
 package cn.fateverse.query.entity.vo;
 
+import cn.fateverse.common.decrypt.annotation.EncryptField;
 import cn.fateverse.query.entity.DataAdapter;
 import cn.fateverse.common.core.annotaion.Excel;
 import cn.fateverse.query.enums.DataAdapterSource;
@@ -30,6 +31,7 @@ public class DataAdapterVo {
      * 数据适配器id
      */
     @ApiModelProperty("数据适配器id")
+    @EncryptField
     private Long adapterId;
 
     /**
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java
index 783cb03..76f5462 100644
--- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java
@@ -36,7 +36,7 @@ public class JavaEngineExecuteHandler implements EngineExecuteHandler {
 
     @Override
     public Object execute(DataAdapter dataAdapter, Object data, boolean development) {
-        if (dataAdapter.getType() != DataAdapterType.JAVA) {
+        if (!DataAdapterType.JAVA.equals(dataAdapter.getType())){
             return null;
         }
         return javaCodeEngine.execute(dataAdapter.getExecuteCode(), getClassName(dataAdapter),
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java
index 7bb4286..48b4b50 100644
--- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java
@@ -2,6 +2,7 @@ package cn.fateverse.query.handler.engine.impl;
 
 import cn.fateverse.common.code.engine.JavaScriptEngine;
 import cn.fateverse.query.entity.DataAdapter;
+import cn.fateverse.query.enums.DataAdapterType;
 import cn.fateverse.query.handler.engine.EngineExecuteHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -18,6 +19,9 @@ public class JavaScriptEngineExecuteHandler implements EngineExecuteHandler {
 
     @Override
     public Object execute(DataAdapter dataAdapter, Object data, boolean development) {
+        if (!DataAdapterType.JAVA_SCRIPT.equals(dataAdapter.getType())){
+            return null;
+        }
         return JavaScriptEngine.executeScript(dataAdapter.getExecuteCode(), "execute", data);
     }