diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index d38ba5d4..8b498e43 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -354,7 +354,7 @@
and t.account_period = #{accountPeriod}
- and t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null
+ and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
@@ -452,7 +452,7 @@
and t.invoice_source = #{invoiceSource}
- and (t.comp_code = #{companyCode} and t.comp_code = '' or t.comp_code is null)
+ and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
GROUP BY t.uuid
ORDER BY t.create_date DESC
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 780b5797..c11cce0b 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -722,6 +722,12 @@
and t.account_period = #{accountPeriod}
+
+ and t.tax_rate = #{taxRate}
+
+
+ and t.tax_rate like '%,%'
+
order by t.qs_date desc,t.invoice_date desc