代码提交

bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml

@@ -286,7 +286,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bp.pro_center as proCenter,
         bp.actual_end_date as actualEndDate,
         DATEDIFF(NOW(), bp.actual_end_date) as daysDiff,
-        sum(sai.num) num,
+        sai.num num,
         mt.type_name as typeModelName,
         mt.unit_name as unit,
         mt2.type_name as typeName,
@@ -298,7 +298,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.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null
-        and sd.dept_id = #{deptId}
+        and sd.dept_id = #{deptId} and bp.pro_center is not null
         <if test="proId != null">
             AND bp.pro_id = #{proId}
         </if>
@@ -317,7 +317,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeModelName != null and typeModelName !=''">
             AND mt.type_name like concat ('%', #{typeModelName}, '%')
         </if>
-
     </select>
     <select id="getInventoryAlert" resultType="com.bonus.material.push.domain.InventoryAlertBean">
         select