From 970f65f9629bd9817ce22ecd0c0ad04e45a0d62d Mon Sep 17 00:00:00 2001
From: itcast <hello@itcast.cn>
Date: Fri, 16 Jan 2026 15:00:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=85=A5=E5=BA=93=EF=BC=8C?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=87=BA=E5=BA=93=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/ma/controller/WarehousingController.java | 6 ++++++
 .../java/com/bonus/material/ma/domain/PutInStorageBean.java | 2 ++
 .../resources/mapper/material/basic/ComplexQueryMapper.xml  | 4 ++--
 .../main/resources/mapper/material/ma/WarehousingMapper.xml | 3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WarehousingController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WarehousingController.java
index f86a3e49..65fb9a6a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WarehousingController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WarehousingController.java
@@ -8,6 +8,7 @@ import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import com.bonus.material.ma.domain.PutInStorageBean;
 import com.bonus.material.ma.domain.SavePutInfoDto;
 import com.bonus.material.ma.domain.SupplierInfo;
+import com.bonus.material.ma.service.ITypeService;
 import com.bonus.material.ma.service.WarehousingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,12 +29,17 @@ public class WarehousingController extends BaseController {
     @Autowired
     private WarehousingService warehousingService;
 
+    @Autowired
+    private ITypeService typeService;
+
     /**
      * 查询入库盘点列表
      */
     @ApiOperation(value = "获取入库盘点列表")
     @GetMapping("/getList")
     public TableDataInfo getList(PutInStorageBean bean) {
+        Long deptId = typeService.getUserDeptId();
+        bean.setCompanyId(deptId);
         startPage();
         List<PutInStorageBean> list = warehousingService.getList(bean);
         return getDataTable(list);
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PutInStorageBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PutInStorageBean.java
index ef15dd91..8a732b77 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PutInStorageBean.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PutInStorageBean.java
@@ -98,4 +98,6 @@ public class PutInStorageBean extends BaseEntity {
     private String code;
 
     private Integer infoId;
+
+    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 6cb3d327..fedc1498 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
@@ -279,7 +279,7 @@
             AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
         </if>
         <if test="companyId!=null">
-            and bs.company_id = #{companyId}
+            and mt.company_id = #{companyId}
         </if>
         order by bs.create_time desc
     </select>
@@ -357,7 +357,7 @@
             AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
         </if>
         <if test="companyId!=null">
-            and bs.company_id = #{companyId}
+            and mt.company_id = #{companyId}
         </if>
         order by bs.create_time desc
     </select>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WarehousingMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WarehousingMapper.xml
index 1ad5087c..6120bcce 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WarehousingMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WarehousingMapper.xml
@@ -22,6 +22,9 @@
         left join ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = '0'
         left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0'
         WHERE 1=1
+          <if test="companyId !=null">
+          and mt.company_id=#{companyId}
+          </if>
         <if test="keyWord != null and keyWord != ''">
             AND (
             psi.code LIKE CONCAT('%',#{keyWord},'%') OR