From 9f48d3e5c6fb095423cc78b310567235adf3e45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Tue, 7 Nov 2023 10:12:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=AE=A4=E8=AF=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8F=AF=E4=BB=A5=E8=AE=A4=E8=AF=81=E6=9C=AA=E5=85=A5?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=91=E7=A5=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 69523f6d..d37d8305 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1045,6 +1045,7 @@
         and d.tj_status in('0','3')
         and invoice_date between c.select_start_date and c.select_end_date
         and t.company = #{company}
+        and t.inaccount_status = '1'
         and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
@@ -1093,12 +1094,6 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
-            and t.inaccount_status = #{inAccountStatus}
-        </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
-            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
-        </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>