From 0e7e6dc5b0100cb25c9e9cecea21c696a8b00da4 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Tue, 9 Sep 2025 09:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=A3=E5=B7=A5=E6=9C=BA=E5=85=B7=E6=95=B0?=
=?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/material/push/ProDataUseInfoMapper.xml | 5 +++++
1 file changed, 5 insertions(+)
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 a6b56b8c..3b83f929 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
@@ -278,8 +278,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join bm_agreement_info bai on sai.agreement_id = bai.agreement_id
left join bm_project bp on bai.project_id = bp.pro_id
left join sys_dept sd on bp.imp_unit = sd.dept_id
+ 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.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
and dept_id not in (339,340,342,346)
+ and mt.jiju_type = 1
+ and mt2.is_statics != 1
AND sd.dept_name = #{deptName}
@@ -304,6 +308,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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 = 1
+ and mt2.is_statics != 1
and sd.dept_id = #{deptId}