From 90c5db50a08ccc73e3a7b6436b2ef5b91cdedfb5 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 18 May 2023 14:34:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=80=92=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 788d1866..f753a78a 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -83,7 +83,7 @@
         select
         t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no
         gfsh,t.gf_name
-        gfmc,t.dept_id deptId,t.dept_name deptName,t.bzdh,t.inaccount_status inAccountStatus,t.comp_code compCode
+        gfmc,t.dept_id deptId,t.dept_name deptName,
         t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,
         date_format(t.rzh_date,'%Y-%m-%d') rzh_date,date_format(t.qs_date, '%Y-%m-%d')
         qs_date,t.rzh_type,
@@ -100,12 +100,6 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
-            and t.comp_code = #{companyCode}
-        </if>
-        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
-            and (t.comp_code = '' or t.comp_code is null)
-        </if>
         <if
                 test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99' ">
             and t.invoice_status = #{invoiceStatus}