From d3f5e75133b7a78efe5b20bd1cc2b0fe06f368ac Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Fri, 9 Jan 2026 11:15:38 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=20=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=20-=E4=BE=9B=E5=BA=94=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=20-?=
 =?UTF-8?q?=E7=AB=A3=E5=B7=A5=E6=9C=AA=E5=BD=92=E8=BF=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=20=20=E6=9D=83=E9=99=90=E6=95=B0=E6=8D=AE=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/service/impl/ComplexQueryServiceImpl.java  | 10 ++++++++++
 .../bonus/material/push/domain/MachineInfoBean.java  |  1 +
 .../mapper/material/basic/ComplexQueryMapper.xml     | 12 ++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
index d63050d6..524a5bb2 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
@@ -656,6 +656,11 @@ public class ComplexQueryServiceImpl implements ComplexQueryService {
     @Override
     public List<ProjUsingRecord> getStatisticsList(ProjUsingRecord bean) {
         try {
+            /**
+             * jsk
+             */
+            Long companyId=iTypeService.getUserDeptId();
+            bean.setCompanyId(companyId.intValue());
             // 1、查询工程对应的物资名称、型号、需求数量、已供数量
             List<ProjUsingRecord> list = complexQueryMapper.getStatisticsList(bean);
 
@@ -876,6 +881,11 @@ public class ComplexQueryServiceImpl implements ComplexQueryService {
      */
     @Override
     public List<MachineInfoBean> getFinishNoReturnList(MachineInfoBean bean) {
+        /**
+         * jsk
+         */
+        Long companyId=iTypeService.getUserDeptId();
+        bean.setCompanyId(companyId);
         return complexQueryMapper.getFinishNoReturnList(bean);
     }
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
index 7924d7a8..76589021 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
@@ -69,4 +69,5 @@ public class MachineInfoBean {
     //租赁价格
     private String leasePrice;
 
+    private Long companyId;
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
index 2ec3bf2d..d6f659ad 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
@@ -641,6 +641,9 @@
         sai.is_slt = '0'
         and bp.pro_name is not null
         and mt.del_flag='0'
+        <if test="companyId != null and companyId != ''">
+            and mt.company_id=#{companyId}
+        </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( sai.start_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
@@ -696,6 +699,9 @@
         and mt.del_flag=0
         and tt.task_type = '2'
         and tt.task_status in (3, 4)
+        <if test="companyId != null and companyId != ''">
+            and mt.company_id=#{companyId}
+        </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( lad.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
@@ -747,6 +753,9 @@
         bp.pro_name is not null
         and mt.del_flag='0'
         and tt.task_type = '19'
+        <if test="companyId != null and companyId != ''">
+            and mt.company_id=#{companyId}
+        </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( lpd.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
@@ -2171,6 +2180,9 @@
         and bai.is_show = 1
         and mt.jiju_type = 1
         and mt2.is_statics != 1
+        <if test="companyId != null and companyId != ''">
+            and mt.company_id=#{companyId}
+        </if>
         <if test="deptName != null and deptName != ''">
             and sd.dept_name = #{deptName}
         </if>