From 1b0df9249b2d4038e57477030fbb4700b07f3ef9 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Wed, 11 Sep 2024 10:24:49 +0800
Subject: [PATCH] =?UTF-8?q?app=E6=94=B6=E6=A0=B7=E6=96=B0=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/app/ExperimentalAppMapper.xml | 13 +++++++++----
 .../mappers/app/SamplesManageAppMapper.xml          |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mappers/app/ExperimentalAppMapper.xml b/src/main/resources/mappers/app/ExperimentalAppMapper.xml
index 0d719c0..54df2ac 100644
--- a/src/main/resources/mappers/app/ExperimentalAppMapper.xml
+++ b/src/main/resources/mappers/app/ExperimentalAppMapper.xml
@@ -646,13 +646,18 @@
 
     <select id="getLsExperDevs" resultType="com.bonus.aqgqj.app.entity.ExperDevAppVo">
         SELECT tsd.id,
-               tsd.dev_code AS devCode,
-               tsd.dev_module AS devModule,
+               tsd.dev_code      AS devCode,
+               tsd.dev_module    AS devModule,
+               tsd.dev_type_code AS devTypeCode,
+               tsd.dev_type_name AS devTypeName,
                tsd.department_id AS departmentId,
-               tsd.id AS devId
+               tsd.id            AS devId
         FROM tb_sample_device tsd
                  LEFT JOIN tb_exper_dev ted ON tsd.id = ted.dev_id AND ted.exper_id = #{id}
-        WHERE tsd.sample_id = #{sampleId} AND tsd.dev_type_code = #{devTypeCode} AND tsd.del_falg = 0 AND ted.id IS NULL
+        WHERE tsd.sample_id = #{sampleId}
+          AND tsd.dev_type_code = #{devTypeCode}
+          AND tsd.del_falg = 0
+          AND ted.id IS NULL
         ORDER BY tsd.id
     </select>
 </mapper>
diff --git a/src/main/resources/mappers/app/SamplesManageAppMapper.xml b/src/main/resources/mappers/app/SamplesManageAppMapper.xml
index a539d4d..faf6834 100644
--- a/src/main/resources/mappers/app/SamplesManageAppMapper.xml
+++ b/src/main/resources/mappers/app/SamplesManageAppMapper.xml
@@ -264,7 +264,7 @@
 			tb_exper_config_info teci
 				LEFT JOIN tb_exper_config tec ON teci.config_id = tec.id
 				LEFT JOIN tb_config_items tci ON teci.item_id = tci.id
-				LEFT JOIN tb_sample_device tsd ON tec.dev_type_name = tsd.dev_type_name
+				LEFT JOIN tb_sample_device tsd ON tec.dev_type_name = tsd.dev_type_name and tsd.del_falg=0
 		WHERE
 			tsd.sample_id = #{id}
 		  AND tec.del_flag = 0