From 5f43e82f15a02301ac25681bb3afe9ae7f575e4c Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 24 Aug 2023 19:49:47 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/core/thread/InvoiceOutExportThread.java  | 3 ++-
 dxhy-core/src/main/resources/mapper/InvoiceOutMapper.xml   | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

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 @@
         <if test="gfsh != null">
             and b.gf_tax_no = #{gfsh}
         </if>
-        <if test="gfshList != null and gfshList.size()>0">
-            and b.gf_tax_no in
-            <foreach collection="gfshList" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
+        <if test="companyCode != null">
+            and b.comp_code = #{companyCode}
         </if>
         <if test="sellerName != null">
             and b.xf_name LIKE CONCAT(#{sellerName}, '%')