From 7fc24398ad11bf779ac0210eca6a922239964c92 Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Fri, 9 Jan 2026 13:34:46 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=E4=B8=9A=E5=8A=A1=E5=8A=9E=E7=90=86-?=
 =?UTF-8?q?=E8=A3=85=E5=8D=B8=E5=8D=95=20=E6=9D=83=E9=99=90=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/back/domain/HandlingOrder.java    | 2 ++
 .../back/service/impl/BackApplyInfoServiceImpl.java      | 9 +++++++++
 .../mapper/material/back/BackApplyInfoMapper.xml         | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/HandlingOrder.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/HandlingOrder.java
index b345c3ca..c1f17de6 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/HandlingOrder.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/HandlingOrder.java
@@ -81,4 +81,6 @@ public class HandlingOrder implements Serializable {
 
     private String signUrl;
 
+    private Long companyId;
+
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
index 74122b4d..64acec3f 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
@@ -34,6 +34,7 @@ import com.bonus.material.common.domain.vo.AgreementVo;
 import com.bonus.material.common.mapper.SelectMapper;
 import com.bonus.material.lease.mapper.LeaseApplyInfoMapper;
 import com.bonus.material.ma.mapper.MachineMapper;
+import com.bonus.material.ma.service.ITypeService;
 import com.bonus.material.purchase.config.RemoteConfig;
 import com.bonus.material.settlement.domain.SltAgreementInfo;
 import com.bonus.material.settlement.mapper.SltAgreementInfoMapper;
@@ -96,6 +97,9 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
     @Resource
     private BmUnitMapper bmUnitMapper;
 
+    @Resource
+    private ITypeService iTypeService;
+
     /**
      * 查询退料任务 - 性能优化版
      *
@@ -2229,6 +2233,11 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
 
     @Override
     public List<HandlingOrder> getHandlingOrderList(HandlingOrder bean) {
+        /**
+         * jsk
+         */
+        Long companyId=iTypeService.getUserDeptId();
+        bean.setCompanyId(companyId);
         List<HandlingOrder> list = backApplyInfoMapper.getHandlingOrderList(bean);
         if (list.size()>0){
             for (HandlingOrder handlingOrder : list){
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
index afc00bcd..0a78952f 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
@@ -1129,6 +1129,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN bm_project bp on bp.pro_id = bho.pro_id
         LEFT JOIN sys_user su on su.user_id=bho.update_by
         WHERE bho.is_active = '1'
+        <if test="companyId !=null and companyId !=''">
+          and bp.company_id=#{companyId}
+        </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and bho.reserve_date BETWEEN #{startTime} AND #{endTime}
         </if>