diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
index 7779dafa..75fa70f9 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
@@ -918,7 +918,7 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
// 获取usList中的班组id,且去重的数量
info.setTeamNum((int) useInfoList.stream()
- .map(MaterialRetainedEquipmentInfo::getTeamId)
+ .map(MaterialRetainedEquipmentInfo::getTeamName)
.filter(Objects::nonNull)
.distinct()
.count());
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
index e5a4e96e..564a4fb3 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
@@ -1483,6 +1483,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
WHERE mt.`level` = 4 and mt.del_flag = '0'
+ and mt2.type_name not in ('安全围栏(三角旗)', '安全围网', '标牌', '标识卡', '彩旗', '冲锋衣', '春秋装(管理)'
+ , '春秋装(一线)', '电力复合脂', '胶鞋', '救生衣', '军棉袄', '劳保鞋', '铝包带', '滤盒', '滤芯', '马夹', '毛巾'
+ , '棉村', '棉大衣', '手电筒', '手套', '洗衣粉', '夏装(管理)', '夏装(一线)', '雨衣')
AND mt.unit_value = #{unitValue}
@@ -1540,6 +1543,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and sd.dept_id not in (342,345,347,348,101,344)
and bp.pro_id not in (3414,1192,3321,3595)
and bp.pro_center IS NOT NULL
+ and mt2.type_name not in ('安全围栏(三角旗)', '安全围网', '标牌', '标识卡', '彩旗', '冲锋衣', '春秋装(管理)'
+ , '春秋装(一线)', '电力复合脂', '胶鞋', '救生衣', '军棉袄', '劳保鞋', '铝包带', '滤盒', '滤芯', '马夹', '毛巾'
+ , '棉村', '棉大衣', '手电筒', '手套', '洗衣粉', '夏装(管理)', '夏装(一线)', '雨衣')
AND sd.dept_name = #{impUnitName}
@@ -2439,6 +2445,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bu.type_id in(32,33)
and bp.pro_id not in (3414,1192,3321,3595)
and bp.pro_center IS NOT NULL
+ and mt2.type_name not in ('安全围栏(三角旗)', '安全围网', '标牌', '标识卡', '彩旗', '冲锋衣', '春秋装(管理)'
+ , '春秋装(一线)', '电力复合脂', '胶鞋', '救生衣', '军棉袄', '劳保鞋', '铝包带', '滤盒', '滤芯', '马夹', '毛巾'
+ , '棉村', '棉大衣', '手电筒', '手套', '洗衣粉', '夏装(管理)', '夏装(一线)', '雨衣')
AND sd.dept_name = #{impUnitName}
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
index 9ac5edf2..8350af0b 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
@@ -983,6 +983,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = '0'
WHERE
sai.STATUS = '0' and mt1.type_name is not NULL and mt.type_name is not NULL
+ and mt1.type_name not in ('安全围栏(三角旗)', '安全围网', '标牌', '标识卡', '彩旗', '冲锋衣', '春秋装(管理)'
+ , '春秋装(一线)', '电力复合脂', '胶鞋', '救生衣', '军棉袄', '劳保鞋', '铝包带', '滤盒', '滤芯', '马夹', '毛巾'
+ , '棉村', '棉大衣', '手电筒', '手套', '洗衣粉', '夏装(管理)', '夏装(一线)', '雨衣')
and sai.agreement_id in
#{id}