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'
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 6f450e0..d17440c 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -458,10 +458,16 @@
</select>
<select id="getDeviceMessage" resultType="java.util.Map">
- select d.*
- from device d, structure_item_parameter sip
+ select d.device_name, d.management_number
+ FROM
+ device d,
+ structure_item_parameter sip
where d.ip = #{ip}
and sip.inspection_item = #{inspectionItem}
- limit 1
+ <if test="inspectionItemSubclass != '' and inspectionItemSubclass != null">
+ and sip.inspection_item_subclass = #{inspectionItemSubclass}
+ </if>
+ and d.device_status = 0
+ and d.ins_product_ids is not null
</select>
</mapper>
--
Gitblit v1.9.3