材料站优化

bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml

@@ -1184,6 +1184,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sai.`status` = '0'
           AND sai.end_time IS NULL
           AND sai.back_id IS NULL
+        AND bu.unit_name is not null
+        AND bp.external_id is not NULL
         <if test="impUnitName != null and impUnitName != ''">
             AND sd.dept_name like concat('%',#{impUnitName},'%')
         </if>
@@ -1449,6 +1451,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND IFNULL(subquery1.usNum, 0) - IFNULL(subquery3.usNum, 0) > 0
         GROUP BY mt.type_id,
         subquery1.proId
+        HAVING allNum > 0
     </select>
 
     <select id="getUsInfoList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo">