Merge remote-tracking branch 'origin/master'

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

@@ -270,6 +270,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from bm_project bp
                  left join sys_dept sd on bp.imp_unit = sd.dept_id
         where bp.external_id is not null
+        <if test="deptName != null and deptName != ''">
+            and sd.dept_name = #{deptName}
+        </if>
         GROUP BY bp.imp_unit
     </select>
     <select id="getCompletionNotRefundedDetails" resultType="com.bonus.material.push.domain.MachineInfoBean">