From 27a8ac6197880f826cf8de6e2b9255fb79a6e4a9 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 24 Aug 2023 16:15:42 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/QssbMapper.xml            | 4 ++--
 dxhy-core/src/main/resources/mapper/QstjbMapper.xml           | 4 ++--
 .../src/main/resources/mapper/TDxCustomsRecordMapper.xml      | 2 +-
 dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/QssbMapper.xml b/dxhy-core/src/main/resources/mapper/QssbMapper.xml
index 2bcce79e..a5e3043f 100644
--- a/dxhy-core/src/main/resources/mapper/QssbMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/QssbMapper.xml
@@ -33,9 +33,9 @@
         from t_dx_invoice t inner join t_dx_record_invoice r on t.uuid = r.uuid
         where t.qs_status = '0'
         and t.qs_date between #{qsrqq} and #{qsrqz}
-        and t.gf_tax_no = #{gfsh}
+        and r.gf_tax_no = #{gfsh}
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' ">
-            and t.comp_code = #{companyCode}
+            and (r.comp_code = #{companyCode} or r.comp_code = '' or r.comp_code is null)
         </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">
             and t.xf_name like CONCAT(#{xfmc},'%')
diff --git a/dxhy-core/src/main/resources/mapper/QstjbMapper.xml b/dxhy-core/src/main/resources/mapper/QstjbMapper.xml
index f72bda69..6f43a63f 100644
--- a/dxhy-core/src/main/resources/mapper/QstjbMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/QstjbMapper.xml
@@ -33,9 +33,9 @@
         where
         t.qs_date between #{qsrqq} and #{qsrqz}
         and t.valid = '1'
-        and t.gf_tax_no = #{gfsh}
+        and r.gf_tax_no = #{gfsh}
         <if test="companyCode != null and companyCode != '' and companyCode != 'null'">
-            and t.comp_code = #{companyCode}
+            and (r.comp_code = #{companyCode} or r.comp_code = '' or r.comp_code is null)
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99' ">
             and t.qs_status = #{qszt}
diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
index a65566df..0e14cdfa 100644
--- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
@@ -1194,7 +1194,7 @@
         auth_status as authStatus,
         confirm_user as confirmUser,
         rzh_belong_date as rzhBelongDate,
-        dept_name as deptName
+        dept_name as deptName,
         sn_voucher_number as snVoucherNumber,
         posting_time as postingTime,
         image_id as imageId,
diff --git a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
index da0a12be..5a32939c 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
@@ -99,7 +99,7 @@
         </if>
 
         <if test="queryParams.companyCode!=null and queryParams.companyCode!=''">
-            and p.comp_code = #{queryParams.companyCode}
+            and (p.comp_code = #{queryParams.companyCode} or p.comp_code = '' or p.comp_code is null)
         </if>
 
         <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!=''">