From 781f2999683ca99577026df7ef4b748bf6366dac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 31 五月 2024 17:17:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 2596699..b2cf766 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -153,6 +153,8 @@
         left join ins_product_result ipr on ip.id = ipr.ins_product_id
         where ins_order_id = #{id}
         and state = 1
+        and ins_fiber_id is null
+        and ins_fibers_id is null
     </select>
     <select id="getInsOrderAndSample" resultMap="sampleDto">
         select isa.*,

--
Gitblit v1.9.3