From 89e2d0f8f213daac4b6617ca3abb74d13021cd8f Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Fri, 9 Jan 2026 15:05:42 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=20=E7=AB=A3=E5=B7=A5=E6=9C=AA=E5=BD=92?=
 =?UTF-8?q?=E8=BF=98=E6=9F=A5=E8=AF=A2-=E5=88=86=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=BF=9B=E8=A1=8C=E6=9D=83=E9=99=90=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/common/service/impl/SelectServiceImpl.java  | 2 ++
 .../src/main/resources/mapper/material/common/SelectMapper.xml | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
index 509f01e0..ba28a879 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
@@ -608,6 +608,8 @@ public class SelectServiceImpl implements SelectService {
      */
     @Override
     public List<MaterialRetainedEquipmentInfo> getImpUnitNameList(MaterialRetainedEquipmentInfo bean) {
+        Long companyId=typeService.getUserDeptId();
+        bean.setCompanyId(companyId.intValue());
         return mapper.getImpUnitNameList(bean);
     }
 
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
index 52ce15e5..2e1f62a5 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
@@ -1427,6 +1427,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="proName != null and proName != ''">
             AND bp.pro_name LIKE CONCAT('%', #{proName}, '%')
         </if>
+        <if test="companyId != null and companyId != ''">
+            AND bp.company_id=#{companyId}
+        </if>
         <if test="projectIdList != null  and projectIdList.size() > 0">
             AND bp.external_id in
             <foreach item="item" collection="projectIdList" open="(" separator="," close=")">