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 pqScriptCheckData = this.baseMapper.selectList(queryWrapper); - + List valueTypeList = pqScriptCheckData.stream().map(PqScriptCheckData::getValueType).distinct().collect(Collectors.toList()); LambdaQueryWrapper 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 dictTreeList = dictTreeMapper.selectList(dictTreeLambdaQueryWrapper); Map map = dictTreeList.stream().collect(Collectors.toMap(DictTree::getCode,DictTree::getId)); return map;