diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
index 3e966c34..1dada195 100644
--- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
@@ -205,10 +205,10 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                         checkDataParam.setScriptId(freqDtls.getScriptId());
                         checkDataParam.setIndex(freqDtls.getScriptIndex());
                         checkDataParam.setIsValueTypeName(true);
-                        if(DicDataEnum.F.getCode().equals(issue.getType())||DicDataEnum.VOLTAGE.getCode().equals(issue.getType())){
+                        if (DicDataEnum.F.getCode().equals(issue.getType()) || DicDataEnum.VOLTAGE.getCode().equals(issue.getType())) {
                             checkDataParam.setDataType("avg");
                             issue.setDataType("avg");
-                        }else {
+                        } else {
                             checkDataParam.setDataType(dataType);
                             issue.setDataType(dataType);
                         }
@@ -641,7 +641,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
         return this.update(new LambdaUpdateWrapper<PqScriptDtls>()
                 .set(PqScriptDtls::getEnable, param.getEnable())
                 .eq(PqScriptDtls::getScriptId, param.getScriptId())
-                .eq(PqScriptDtls::getScriptIndex, param.getIndex())
+                .eq(ObjectUtil.isNotNull(param.getIndex()), PqScriptDtls::getScriptIndex, param.getIndex())
+                .eq(ObjectUtil.isNotNull(param.getScriptType()), PqScriptDtls::getScriptType, param.getScriptType())
         );
     }