From 6cac0068a8c1491de2a439e1e48069fd40c6907e Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Mon, 8 Sep 2025 21:31:24 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/material/push/ProDataUseInfoMapper.xml   | 4 +++-
 pom.xml                                                       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
index 1fcd18ea..327ff097 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
@@ -277,7 +277,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join bm_project bp on bai.project_id = bp.pro_id
                  left join sys_dept sd on bp.imp_unit = sd.dept_id
         where sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null  and bp.pro_center is not null and bp.external_id is not null
-        <if test="deptName != null and deptName != ''">
+        and dept_id not in (339,340,340,346)
+          <if test="deptName != null and deptName != ''">
             AND sd.dept_name = #{deptName}
         </if>
         GROUP BY bp.imp_unit
@@ -300,6 +301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join ma_type mt on sai.type_id = mt.type_id
         left join ma_type mt2 on mt.parent_id = mt2.type_id
         where sai.status = 0 and bp.actual_end_date is not null and bp.actual_end_date is not null  and bp.pro_center is not null
+        and mt.jiju_type = 2
         <if test="deptId != null">
             and sd.dept_id = #{deptId}
         </if>
diff --git a/pom.xml b/pom.xml
index f66e3df2..a33c02d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,7 +275,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-scratchpad</artifactId>
-            <version>5.2.3</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>