|
|
|
@ -428,6 +428,7 @@ |
|
|
|
|
and t.invoice_type in('01','03','08','14','31','283','161','183','185') |
|
|
|
|
and t.rzh_yesorno = '0' |
|
|
|
|
and t.auth_status in('0','5','6') |
|
|
|
|
and t.inaccount_status = '1' |
|
|
|
|
and t.export_mark = '0' |
|
|
|
|
and t.company = #{company} |
|
|
|
|
<!-- <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != 99" >--> |
|
|
|
@ -460,12 +461,10 @@ |
|
|
|
|
<!-- #{companyCode}--> |
|
|
|
|
<!-- </foreach>--> |
|
|
|
|
<if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'"> |
|
|
|
|
and (t.comp_code in |
|
|
|
|
and t.comp_code in |
|
|
|
|
<foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")"> |
|
|
|
|
#{companyCode} |
|
|
|
|
</foreach> |
|
|
|
|
or t.comp_code is null or t.comp_code = '' |
|
|
|
|
) |
|
|
|
|
</if> |
|
|
|
|
<if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" > |
|
|
|
|
and t.comp_code = #{companyCode} |
|
|
|
|