From ad10b5cfc215be14c68080c7484369186e9d5016 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 24 七月 2024 15:23:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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