From e2f13c8aaeb1f1f546f61b4a19128f4fec22c925 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 4 Jul 2023 20:08:41 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1sq?=
 =?UTF-8?q?l=E5=8F=82=E6=95=B0=E5=92=8C=E6=89=8B=E5=B7=A5=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=8F=82=E6=95=B0=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 6e996ad1..f1ace545 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -428,6 +428,7 @@
         and t.invoice_type in('01','03','08','14','31','283','161','183','185')
         and t.rzh_yesorno = '0'
         and t.auth_status in('0','5','6')
+        and t.inaccount_status = '1'
         and t.export_mark = '0'
         and t.company = #{company}
 <!--        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != 99" >-->
@@ -460,12 +461,10 @@
 <!--            #{companyCode}-->
 <!--        </foreach>-->
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and (t.comp_code in
+            and t.comp_code in
             <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
                 #{companyCode}
             </foreach>
-            or t.comp_code is null or t.comp_code = ''
-            )
         </if>
         <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
             and t.comp_code = #{companyCode}