From ec5aae048d65c568495b3f811164548c8f7ed172 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Fri, 10 Jan 2025 13:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../script/service/impl/PqScriptCheckDataServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptCheckDataServiceImpl.java b/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptCheckDataServiceImpl.java
index 3d66d040..2558f25b 100644
--- a/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptCheckDataServiceImpl.java
+++ b/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptCheckDataServiceImpl.java
@@ -72,9 +72,9 @@ public class PqScriptCheckDataServiceImpl extends ServiceImpl<PqScriptCheckDataM
                 .eq(PqScriptCheckData::getScriptId, scriptId)
                 .eq(PqScriptCheckData::getEnable, DataStateEnum.ENABLE.getCode());
         List<PqScriptCheckData> pqScriptCheckData = this.baseMapper.selectList(queryWrapper);
-
+        List<String> valueTypeList = pqScriptCheckData.stream().map(PqScriptCheckData::getValueType).distinct().collect(Collectors.toList());
         LambdaQueryWrapper<DictTree> dictTreeLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        dictTreeLambdaQueryWrapper.in(DictTree::getId,pqScriptCheckData.stream().map(PqScriptCheckData::getValueType).distinct().collect(Collectors.toList()));
+        dictTreeLambdaQueryWrapper.in(DictTree::getId,valueTypeList).eq(DictTree::getState,DataStateEnum.DELETED.getCode());
         List<DictTree> dictTreeList = dictTreeMapper.selectList(dictTreeLambdaQueryWrapper);
         Map<String,String> map = dictTreeList.stream().collect(Collectors.toMap(DictTree::getCode,DictTree::getId));
         return map;