From 9260cd98225a042f70644043e7c90f419756f760 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Fri, 19 Sep 2025 14:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/clz/MaterialBackInfoMapper.xml       | 6 ++++++
 .../mapper/material/clz/MaterialLeaseInfoMapper.xml      | 9 ++++++++-
 .../mapper/material/clz/MaterialMachineMapper.xml        | 4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml
index 7732bf5c..ef9201e0 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml
@@ -250,6 +250,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="departName != null and departName != ''">
             and bp.pro_center LIKE CONCAT('%', #{departName}, '%')
         </if>
+        <if test="proName != null and proName != ''">
+            and bp.pro_name LIKE CONCAT('%', #{proName}, '%')
+        </if>
         <if test="teamName != null and teamName != ''">
             and bt.unit_name LIKE CONCAT('%', #{teamName}, '%')
         </if>
@@ -643,6 +646,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="departName != null and departName != ''">
             and bp.pro_center LIKE CONCAT('%', #{departName}, '%')
         </if>
+        <if test="proName != null and proName != ''">
+            and bp.pro_name LIKE CONCAT('%', #{proName}, '%')
+        </if>
         <if test="teamName != null and teamName != ''">
             and bt.unit_name  LIKE CONCAT('%', #{teamName}, '%')
         </if>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
index 8d066f74..aab88ff9 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
@@ -410,6 +410,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="departName != null and departName != ''">
                 and bp.pro_center LIKE CONCAT('%', #{departName}, '%')
             </if>
+            <if test="proName != null and proName != ''">
+                and bp.pro_name   LIKE CONCAT('%', #{proName}, '%')
+            </if>
             <if test="teamName != null and teamName != ''">
                 and bt.unit_name  LIKE CONCAT('%', #{teamName}, '%')
             </if>
@@ -860,7 +863,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         su.nick_name as outPerson,
         lai.`code` as code,
         bp.imp_unit as impUnit,
-        bt.bzz_idcard as idCard
+        bt.bzz_idcard as idCard,
+        lai.sub_unit_name as subUnitName
         FROM
         clz_lease_out_details lod
         LEFT JOIN ma_type mt ON lod.type_id = mt.type_id
@@ -882,6 +886,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="departName != null and departName != ''">
             and bp.pro_center LIKE CONCAT('%', #{departName}, '%')
         </if>
+        <if test="proName != null and proName != ''">
+            and bp.pro_name LIKE CONCAT('%', #{proName}, '%')
+        </if>
         <if test="teamName != null and teamName != ''">
             and bt.unit_name LIKE CONCAT('%', #{teamName}, '%')
         </if>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
index b7f98c5c..d443b10c 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
@@ -784,8 +784,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="proName != null and proName != ''">
             and bp.pro_name   LIKE CONCAT('%', #{proName}, '%')
         </if>
-        <if test="materialName != null and materialName != ''">
-            and mt3.type_name LIKE CONCAT('%', #{materialName}, '%')
+        <if test="typeName != null and typeName != ''">
+            and mt2.type_name LIKE CONCAT('%', #{typeName}, '%')
         </if>
         <if test="teamName != null and teamName != ''">
             and bu.unit_name  LIKE CONCAT('%', #{teamName}, '%')