From c0ac79681c84457780699ae31f988cff952db413 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Wed, 14 Jun 2023 17:25:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?ariesy=20=E7=AD=9B=E9=80=89=E5=B7=B2?=
 =?UTF-8?q?=E5=85=A5=E8=B4=A6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 73c42f8e..871ef232 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -137,7 +137,7 @@
             and t.bzdh = #{bzdh}
         </if>
         <if test="bzdh == null or bzdh == '' or bzdh == 'null' or bzdh == '99'">
-            and t.bzdh is not null
+            and t.bzdh is not null and t.inaccount_status = '1'
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}

From 7082cdbd1d0be41c8c9cf3702ef0e27f6ce88b2f Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 15 Jun 2023 09:31:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E5=8F=B7=E7=A0=81=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/dxhy/core/thread/ManualAthensThread.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
index ada14005..a75f41a0 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
@@ -140,6 +140,7 @@ public class ManualAthensThread extends BaseThread {
                 String gfsh = prams.getString("gfsh");
                 String fpzt = prams.getString("invoiceStatus");
                 String invoiceType = prams.getString("invoiceType");
+                String invoiceNo = prams.getString("invoiceNo");
                 String qszt = prams.getString("qszt");
                 String qsr = prams.getString("qsr");
                 String qsfs = prams.getString("qsfs");
@@ -224,6 +225,7 @@ public class ManualAthensThread extends BaseThread {
                 pramsMap.put("inAccountStatus", inAccountStatus);
                 pramsMap.put("company", company);
                 pramsMap.put("invoiceSource",prams.getString("invoiceSource"));
+                pramsMap.put("invoiceNo",invoiceNo);
                 pramsMap.put("companyCodes",companyCodes);
                 pramsMap.put("companyCode",companyCode);
                 pramsMap.put("snVoucherNumber", prams.getString("snVoucherNumber"));