From 4312800e644b29d199f2952b9becb37fed198ef4 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 12 Jan 2026 11:20:38 +0800
Subject: [PATCH] =?UTF-8?q?5=E5=8F=B7=E5=BA=93=E6=94=B9=E9=80=A0,=E6=9C=BA?=
 =?UTF-8?q?=E5=85=B7=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/basic/controller/ComplexQueryController.java   | 2 ++
 .../resources/mapper/material/basic/ComplexQueryMapper.xml  | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java
index c6469649..46b7d405 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java
@@ -501,6 +501,8 @@ public class ComplexQueryController extends BaseController {
     @GetMapping("/getPersonNum")
     public AjaxResult getPersonNum(RetainedEquipmentInfo bean) {
         startPage();
+        Long deptId = typeService.getUserDeptId();
+        bean.setCompanyId(Math.toIntExact(deptId));
         List<RetainedEquipmentInfo> pageList = complexQueryService.getPersonNum(bean);
         return AjaxResult.success(getDataTable(pageList));
     }
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 78a836c8..5b55a8c0 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
@@ -1692,6 +1692,9 @@
         sai.`status` = '0' and sai.`is_slt` = '0'
         AND sai.end_time IS NULL
         AND sai.back_id IS NULL
+        <if test="companyId != null">
+            AND sai.company_id = #{companyId}
+        </if>
         GROUP BY mt.type_id
         ) AS subquery1
         ON mt.type_id = subquery1.type_id
@@ -1720,6 +1723,9 @@
         <if test="typeModelName != null and typeModelName != ''">
             and mt.type_name like concat('%',#{typeModelName},'%')
         </if>
+        <if test="companyId != null">
+            and mt.company_id = #{companyId}
+        </if>
     </select>
     <select id="batchSelectInfo" resultType="com.bonus.material.basic.domain.UseStorageInfo">
         SELECT