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 1357020d..1b2d5f07 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
@@ -259,26 +259,6 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
     @Override
     public List<MaterialStorageInfo> getMaCodeList(MaterialStorageInfo bean) {
         try {
-//            // 查询库管员
-//            List<MaterialStorageInfo> list = materialMachineMapper.getMaCodeList(bean);
-//            MaterialUseStorageInfo materialUseStorageInfo = new MaterialUseStorageInfo();
-//            materialUseStorageInfo.setProId(StringUtils.isNotBlank(bean.getProId()) ? bean.getProId() : null);
-//            materialUseStorageInfo.setTypeId(bean.getTypeId() != null ? bean.getTypeId() : null);
-//            List<MaterialUseStorageInfo> userList = materialMachineMapper.getUserRecords(materialUseStorageInfo);
-//            if (CollectionUtils.isNotEmpty(list)) {
-//                if (CollectionUtils.isNotEmpty(userList)) {
-//                    list.removeIf(info -> {
-//                        for (MaterialUseStorageInfo useStorageInfo : userList) {
-//                            if (info.getMaId()!=null && useStorageInfo.getMaId()!=null){
-//                                if (info.getMaId().equals(useStorageInfo.getMaId())) {
-//                                    return true;
-//                                }
-//                            }
-//                        }
-//                        return false;
-//                    });
-//                }
-//            }
             List<MaterialStorageInfo> list = new ArrayList<>();
             if (!StringHelper.isNullOrEmptyString(bean.getTeamId())){
                 list = materialMachineMapper.getMaCodeDetails(bean);
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 fc0bd8c8..f8ae8666 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
@@ -1058,16 +1058,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDepartNum" resultType="java.lang.Integer">
         SELECT
-        COUNT( project_dept_id )
+        COUNT( DISTINCT project_dept_id )
         FROM
-        data_center.dx_fb_son
+        bm_project bp
+        LEFT JOIN data_center.dx_fb_son dx ON dx.id = bp.external_id
+        LEFT JOIN sys_dept sd ON bp.imp_unit = sd.dept_id
         WHERE
-        1 =1
+        bp.external_id IS NOT NULL
+        AND bp.actual_end_date IS NULL
+        <if test="proName != null and proName != ''">
+            AND bp.pro_name like concat('%',#{proName},'%')
+        </if>
         <if test="impUnitName != null and impUnitName != ''">
-            AND apply_company = #{impUnitName}
+            AND sd.dept_name like concat('%',#{impUnitName},'%')
         </if>
         <if test="departName != null and departName != ''">
-            AND project_dept = #{departName}
+            AND bp.pro_center like concat('%',#{departName},'%')
+        </if>
+        <if test="impUnit != null and impUnit != ''">
+            AND bp.imp_unit = #{impUnit}
+        </if>
+        <if test="projectIdList != null  and projectIdList.size() > 0">
+            AND bp.external_id  in
+            <foreach item="item" collection="projectIdList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
     </select>
 
@@ -1082,17 +1097,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             sai.is_slt = 0
           AND bp.external_id IS NOT NULL
+        <if test="proName != null and proName != ''">
+            AND bp.pro_name like concat('%',#{proName},'%')
+        </if>
         <if test="impUnitName != null and impUnitName != ''">
-            AND sd.dept_name = #{impUnitName}
+            AND sd.dept_name like concat('%',#{impUnitName},'%')
         </if>
         <if test="departName != null and departName != ''">
-            AND bp.pro_center = #{departName}
+            AND bp.pro_center like concat('%',#{departName},'%')
         </if>
         <if test="impUnit != null and impUnit != ''">
-            and bp.imp_unit = #{impUnit}
+            AND bp.imp_unit = #{impUnit}
         </if>
         <if test="projectIdList != null  and projectIdList.size() > 0">
-            and bp.external_id  in
+            AND bp.external_id  in
             <foreach item="item" collection="projectIdList" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -1104,17 +1122,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COUNT( DISTINCT bz.id )
         FROM
         `micro-tool`.bzgl_bz bz
-        LEFT JOIN `micro-tool`.bzgl_bz_jccdj bc ON bz.id = bc.bz_id
+        LEFT JOIN bm_project bp ON bp.external_id = bz.project_id
+        LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit
         WHERE
-        bz.bz_status = 3
-        <if test="impUnitName != null and impUnitName != ''">
-            AND bc.sszz = #{impUnitName}
-        </if>
+        bp.external_id IS NOT NULL
+        AND bp.actual_end_date IS NULL
         <if test="proName != null and proName != ''">
-            AND bz.project_name = #{proName}
+            AND bp.pro_name like concat('%',#{proName},'%')
+        </if>
+        <if test="impUnitName != null and impUnitName != ''">
+            AND sd.dept_name like concat('%',#{impUnitName},'%')
+        </if>
+        <if test="departName != null and departName != ''">
+            AND bp.pro_center like concat('%',#{departName},'%')
+        </if>
+        <if test="impUnit != null and impUnit != ''">
+            AND bp.imp_unit = #{impUnit}
         </if>
         <if test="projectIdList != null  and projectIdList.size() > 0">
-            and bz.project_id  in
+            AND bp.external_id  in
             <foreach item="item" collection="projectIdList" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -1156,31 +1182,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND sai.end_time IS NULL
           AND sai.back_id IS NULL
         <if test="impUnitName != null and impUnitName != ''">
-            AND sd.dept_name = #{impUnitName}
+            AND sd.dept_name like concat('%',#{impUnitName},'%')
         </if>
         <if test="proName != null and proName != ''">
-            AND bp.pro_name = #{proName}
+            AND bp.pro_name like concat('%',#{proName},'%')
         </if>
         <if test="departName != null and departName != ''">
-            AND bp.pro_center = #{departName}
+            AND bp.pro_center like concat('%',#{departName},'%')
         </if>
         <if test="teamName != null and teamName != ''">
-            AND bu.unit_name = #{teamName}
+            AND bu.unit_name like concat('%',#{teamName},'%')
         </if>
         <if test="typeName != null and typeName != ''">
-            AND mt2.type_name = #{typeName}
+            AND mt2.type_name like concat('%',#{typeName},'%')
         </if>
         <if test="typeModelName != null and typeModelName != ''">
-            AND mt.type_name = #{typeModelName}
+            AND mt.type_name like concat('%',#{typeModelName},'%')
         </if>
         <if test="projectIdList != null  and projectIdList.size() > 0">
-            and bp.external_id in
+            AND bp.external_id in
             <foreach item="item" collection="projectIdList" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
         <if test="impUnit != null and impUnit != ''">
-            and bp.imp_unit = #{impUnit}
+            AND bp.imp_unit = #{impUnit}
         </if>
     </select>
 
@@ -1217,31 +1243,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND sai.end_time IS NULL
           AND sai.back_id IS NULL
         <if test="impUnitName != null and impUnitName != ''">
-            AND sd.dept_name = #{impUnitName}
+            AND sd.dept_name like concat('%',#{impUnitName},'%')
         </if>
         <if test="proName != null and proName != ''">
-            AND bp.pro_name = #{proName}
+            AND bp.pro_name like concat('%',#{proName},'%')
         </if>
         <if test="departName != null and departName != ''">
-            AND bp.pro_center = #{departName}
+            AND bp.pro_center like concat('%',#{departName},'%')
         </if>
         <if test="teamName != null and teamName != ''">
-            AND bu.unit_name = #{teamName}
+            AND bu.unit_name like concat('%',#{teamName},'%')
         </if>
         <if test="typeName != null and typeName != ''">
-            AND mt2.type_name = #{typeName}
+            AND mt2.type_name like concat('%',#{typeName},'%')
         </if>
         <if test="typeModelName != null and typeModelName != ''">
-            AND mt.type_name = #{typeModelName}
+            AND mt.type_name like concat('%',#{typeModelName},'%')
         </if>
         <if test="projectIdList != null  and projectIdList.size() > 0">
-            and bp.external_id in
+            AND bp.external_id in
             <foreach item="item" collection="projectIdList" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
         <if test="impUnit != null and impUnit != ''">
-            and bp.imp_unit = #{impUnit}
+            AND bp.imp_unit = #{impUnit}
         </if>
     </select>
 
@@ -1469,13 +1495,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND mt.type_name  LIKE CONCAT('%', #{typeModelName}, '%')
         </if>
         <if test="projectIdList != null  and projectIdList.size() > 0">
-            and bp.external_id in
+            AND bp.external_id in
             <foreach item="item" collection="projectIdList" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
         <if test="impUnit != null and impUnit != ''">
-            and bp.imp_unit = #{impUnit}
+            AND bp.imp_unit = #{impUnit}
         </if>
         GROUP BY mt.type_id,
         bu.unit_name,