From 26becb8ead5a00ed870a02da6535d7f1c54f32cc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:02 +0800
Subject: [PATCH] 班次新增定时+检验任务负责人

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

diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index c644e16..b2f30cf 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -47,9 +47,10 @@
         LEFT JOIN ( <!--SELECT * FROM ins_sample_user GROUP BY ins_sample_id, user_id -->
         SELECT *
         FROM ins_sample_user u
-        WHERE (ins_sample_id, id) IN (
+        WHERE son_laboratory=#{sonLaboratory} and (ins_sample_id, id) IN (
         SELECT ins_sample_id, MAX(id)
         FROM ins_sample_user
+        WHERE son_laboratory=#{sonLaboratory}
         GROUP BY ins_sample_id
         )
         ORDER BY ins_sample_id, id
@@ -71,7 +72,7 @@
         ) a
         LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
         left join (SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM
-        ins_sample_user GROUP BY ins_sample_id) md where td.id = md.id
+        ins_sample_user where son_laboratory=#{sonLaboratory} GROUP BY ins_sample_id) md where td.id = md.id
         <if test="userId !=null and userId!=''">
             and user_id = #{userId} OR user_id is NULL
         </if>

--
Gitblit v1.9.3