From c65ab218b14e87489f1594b2d932f7bd54b3ba11 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十月 2025 13:34:19 +0800
Subject: [PATCH] 数采调整

---
 cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
index b7a30f7..44cba26 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
@@ -88,7 +88,12 @@
         if (dataConfig.getStructureItemParameterId() == null) {
             throw new RuntimeException("缂哄皯妫�娴嬮」id");
         }
-        List<DataConfig> list = baseMapper.selectList(Wrappers.<DataConfig>lambdaQuery().eq(DataConfig::getStructureItemParameterId, dataConfig.getStructureItemParameterId()));
+        List<DataConfig> list = baseMapper.selectList(Wrappers.<DataConfig>lambdaQuery()
+                        .eq(DataConfig::getDeviceId,dataConfig.getDeviceId())
+                        .eq(DataConfig::getInspectionItem,dataConfig.getInspectionItem())
+                        .eq(DataConfig::getInspectionItemClass,dataConfig.getInspectionItemClass())
+                        .eq(DataConfig::getInspectionItemSubclass,dataConfig.getInspectionItemSubclass())
+                        .eq(DataConfig::getStructureItemParameterId, dataConfig.getStructureItemParameterId()));
         return Result.success(list);
     }
 

--
Gitblit v1.9.3