From 8b5519223f102e30b26af9703f8d1338b03e2c03 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Tue, 7 May 2024 16:29:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/app/BackReceiveMapper.xml  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index f16c7ec5..6e607072 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -865,8 +865,8 @@
       slt_agreement_info
     WHERE
       agreement_id = #{agreementId}
-      AND
-      type_id = #{typeId}
+      AND type_id = #{typeId}
+      AND status = 0
       <if test="maId != null">
         AND ma_id = #{maId}
       </if>
@@ -903,10 +903,13 @@
     ma_type mt
     LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
     LEFT JOIN ma_machine mm ON mt.type_id = mm.type_id
+    LEFT JOIN slt_agreement_info sai ON sai.ma_id = mm.ma_id
     LEFT JOIN sys_dic sd ON sd.id = mm.ma_status
     WHERE
-    mm.ma_status  = '16'
+    mm.ma_status = '16'
     AND mt.type_id = #{typeId}
+    AND sai.`status` = 0
+    AND sai.agreement_id = #{agreementId}
     <if test="maCode != null and maCode !=''">
       AND mm.ma_code like concat('%', #{maCode}, '%')
     </if>