From 22837aa98ddddb25764d6d97e0e13c3df45df5be Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 17:31:07 +0800
Subject: [PATCH] 数采bug调整

---
 cnas-server/src/main/resources/mapper/DataConfigMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
index 7701b02..e8b009f 100644
--- a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -32,7 +32,8 @@
                  left join device_data_config ddc on ddc.device_id = d.id and
                                                      if(ip.inspection_item_subclass is not null and
                                                         ip.inspection_item_subclass != '', ip.inspection_item_subclass,
-                                                        ip.inspection_item) = ddc.ins_product_item
+                                                        ip.inspection_item) = ddc.inspection_item_subclass and
+                                                     ip.inspection_item = ddc.inspection_item
         where d.id = #{deviceId}
     </select>
 </mapper>

--
Gitblit v1.9.3