From 80745feb3ebe375e49e592c96540cc6acd123bc4 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 22 Aug 2023 20:19:59 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E9=80=92=E5=BD=92=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E7=A8=8E=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml           | 3 +++
 dxhy-core/src/main/resources/mapper/QsxxMapper.xml             | 2 +-
 .../service/caution/ExtCautionExpirationServiceImpl.java       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml
index a54f165f..8e9064ef 100644
--- a/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml
@@ -61,6 +61,9 @@
       <if test="invoiceSource != null and invoiceSource != '' and invoiceSource != 'null' and invoiceSource != '99' ">
           and t.invoice_source = #{invoiceSource}
       </if>
+      <if test="companyCode != null and companyCode != '' and companyCode != 'null'">
+          and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
+      </if>
       order by t.invoice_date desc
   </select>
 
diff --git a/dxhy-core/src/main/resources/mapper/QsxxMapper.xml b/dxhy-core/src/main/resources/mapper/QsxxMapper.xml
index cde4c27d..b7ccad96 100644
--- a/dxhy-core/src/main/resources/mapper/QsxxMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/QsxxMapper.xml
@@ -31,7 +31,7 @@
         t.id,t.notes,t.qs_type,t.gf_name,t.xf_name,t.qs_status,t.qs_date,t.user_name,t.invoice_code,t.invoice_no
         ,t.ele_invoice_no,t.invoice_type,t.uuid,t.invoice_date,t.invoice_amount,t.tax_amount,t.dept_id,t.dept_name
         ,t.scan_id,t.remark,t.gf_tax_no,t.xf_tax_no,t.create_date,t.total_amount,t.voucher_number,r.sn_voucher_number,r.posting_time,r.image_id,r.account_period,r.bzdh,bzr,r.inaccount_status,r.comp_code
-        from t_dx_invoice t inner join t_dx_record_invoice r on t.uuid = r.uuid
+        from t_dx_invoice t left join t_dx_record_invoice r on t.uuid = r.uuid
         WHERE t.valid = '1'
         <if test="qsNameFlag == null">
             and t.user_account = #{userid}
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
index d4d0de03..ea0286ec 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
@@ -213,7 +213,7 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl<ExtTdxRec
 
         // 购方税号
         queryWrapper.eq("gf_tax_no",reqVO.getGfsh());
-        queryWrapper.eq("comp_code",reqVO.getCompanyCode());
+        queryWrapper.eq("comp_code",reqVO.getCompanyCode()).or().eq("comp_code","").or().isNull("comp_code");
         // 发票号码
         if (StringUtils.isNotBlank(reqVO.getInvoiceNo())) {
             queryWrapper.lambda().eq(ExtTdxRecordInvoice::getInvoiceNo, reqVO.getInvoiceNo());