From 26f3dcca791bd8ed22fd85d5843d114377f10fe1 Mon Sep 17 00:00:00 2001
From: itcast <hello@itcast.cn>
Date: Mon, 19 Jan 2026 17:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/material/basic/BmProjectMapper.xml   | 3 +++
 .../src/main/resources/mapper/material/basic/BmUnitMapper.xml  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml
index 6cb296c4..765ceeda 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml
@@ -94,6 +94,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bp.pro_code as proCode
         from bm_project bp
         where bp.del_flag = '0'
+        <if test="companyId != null">
+            and bp.company_id=#{companyId}
+        </if>
         <if test="proName != null and proName != ''">
             <if test="proCode != null and proCode != ''">
                 and (bp.pro_name = #{proName} or bp.pro_code = #{proCode})
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
index a2b01003..4f99bf10 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmUnitByProName" resultType="com.bonus.material.basic.domain.BmUnit">
         select unit_id as unitId, unit_name as unitName from bm_unit where del_flag = 0 and unit_name = #{unitName}
+        <if test="companyId != null"> and company_id =#{companyId}</if>
         <if test="deptId != null">and dept_id = #{deptId}</if>
         <if test="typeId != null">and type_id = #{typeId}</if>
     </select>