diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java index 1785a06e..96226e5d 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java @@ -157,7 +157,8 @@ public class InvoiceOutExportThread extends BaseThread { filter.put("orderByClause", "out_date desc"); // 购方税号 - filter.put("gfshList", gfsh); + filter.put("gfsh", gfsh); + filter.put("companyCode", companyCode); // 销方名称 filter.put("sellerName", StringHelper.isBlank(xfName) ? null : xfName); diff --git a/dxhy-core/src/main/resources/mapper/InvoiceOutMapper.xml b/dxhy-core/src/main/resources/mapper/InvoiceOutMapper.xml index 2efc3096..adb37f53 100644 --- a/dxhy-core/src/main/resources/mapper/InvoiceOutMapper.xml +++ b/dxhy-core/src/main/resources/mapper/InvoiceOutMapper.xml @@ -50,11 +50,8 @@ and b.gf_tax_no = #{gfsh} - - and b.gf_tax_no in - - #{item} - + + and b.comp_code = #{companyCode} and b.xf_name LIKE CONCAT(#{sellerName}, '%')