@@ -670,6 +670,7 @@
m.deleted = 0
AND mp.deleted = 0
AND m.client_manager_id = #{vo.clientManagerId}
+ and off.production_should_amount>0
<if test="vo!=null and vo.name!=null and vo.name !=''">
and mp.name like concat ('%',#{vo.name},'%')
</if>
@@ -91,7 +91,7 @@
and pow.department_check_state is null
<if test="vo!=null and vo.nCode!=null and (vo.nCode=='REPORT_OUT_FINANCE_CHECK' or vo.nCode=='LETTER_OUT_FINANCE_CHECK')">
- and pow.department_check_state = '审核通过'
+ and (pow.department_check_state = '审核通过' or pow.department_check_state is null)
and pow.finance_check_state is null
<if test="keyword!=null and keyword!='' ">