From d8e5d565e01513190ead4f1b5db4853cace22a23 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Wed, 6 Aug 2025 16:55:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/ma/MachineMapper.xml      | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
index 8d977b60..67bd9df5 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
@@ -434,28 +434,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getElectronicLabel" resultType="com.bonus.material.ma.domain.Machine">
         SELECT
-            mm.ma_id as maId,
-            mt2.type_name as materialName,
-            mt.type_name as materialModel,
-            mm.ma_code as maCode,
-            mm.this_check_time as thisCheckTime,
-            mm.next_check_time as nextCheckTime,
-            mm.check_man as checkMan,
-            mm.inspect_man as inspectMan,
-            mm.phone,
-            '合格' as inspectStatus,
-            mm.ma_vender as maVender,
-            mm.ex_code as exCode,
-            mm.ex_url as exUrl,
-            mm.is_jj as isJj,
-            mm.type_id as typeId
+        mm.ma_id as maId,
+        mt2.type_name as materialName,
+        mt.type_name as materialModel,
+        mm.ma_code as maCode,
+        mm.this_check_time as thisCheckTime,
+        mm.next_check_time as nextCheckTime,
+        mm.check_man as checkMan,
+        mm.inspect_man as inspectMan,
+        mm.phone,
+        '合格' as inspectStatus,
+        mm.ma_vender as maVender,
+        mm.ex_code as exCode,
+        mm.ex_url as exUrl,
+        mm.is_jj as isJj,
+        mm.type_id as typeId
         FROM
-            ma_machine mm
-                LEFT JOIN ma_type mt on mt.type_id=mm.type_id
-                LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
+        ma_machine mm
+        LEFT JOIN ma_type mt on mt.type_id=mm.type_id
+        LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
         WHERE
-            mm.ma_status = '2' and
-            mm.ma_code like concat('%', #{maCode}, '%')
+        mm.ma_code like concat('%', #{maCode}, '%')
+        <if test="maId != null">
+          and mm.ma_id = #{maId}
+        </if>
     </select>
 
     <select id="selectMaId" resultType="java.lang.Long">