From 6a733f4bb0e09558c065c2711cae78f10f697021 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Sun, 16 Nov 2025 15:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/back/BackChangeMapper.xml          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml
index 7cead97..b2943c5 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="updateToolInfo">
         UPDATE tool_ledger
-        set tool_status  = #{maStatus},
+        set status  = #{maStatus},
             in_num       = IFNULL(in_num, 0) - 1,
             available_num  = IFNULL(available_num, 0) + 1
         WHERE code = #{devCode}
@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="updateToolInfoRepair">
         UPDATE tool_ledger
-        set tool_status  = #{maStatus},
+        set status  = #{maStatus},
             in_num       = IFNULL(in_num, 0) - 1,
             repair_num  = IFNULL(repair_num, 0) + 1
         WHERE code = #{devCode}
@@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id
         LEFT JOIN ma_type mt5 ON mt4.parent_id = mt5.type_id
         <where>
-            mdi.is_active = '1' and mdi.ma_status = 2
+            mdi.is_active = '1' and mdi.ma_status = 2  AND cdc.del_flag = '0'
             <if test="typeName!=null and typeName!=''">
                 AND mdi.device_name like concat('%',#{typeName},'%')
             </if>
@@ -198,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tool_type tt3 ON tt2.parent_id = tt3.type_id
         LEFT JOIN tool_type tt4 ON tt3.parent_id = tt4.type_id
         <where>
-            tl.manage_mode = '0'
+            tl.manage_mode = '0' AND cdc.del_flag = '0'
             <if test="typeName!=null and typeName!=''">
                 AND tt1.type_name like concat('%',#{typeName},'%')
             </if>
@@ -236,7 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tool_type tt3 ON tt2.parent_id = tt3.type_id
         LEFT JOIN tool_type tt4 ON tt3.parent_id = tt4.type_id
         <where>
-            tl.manage_mode = '1'
+            tl.manage_mode = '1' AND cdc.del_flag = '0'
             <if test="typeName!=null and typeName!=''">
                 AND tt1.type_name like concat('%',#{typeName},'%')
             </if>