From b2024e375d1304bb958f1789dd6e8e8f4d0cb68f Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 5 Sep 2023 22:54:58 +0800
Subject: [PATCH] ariesy

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

diff --git a/dxhy-core/src/main/resources/mapper/SgqsMapper.xml b/dxhy-core/src/main/resources/mapper/SgqsMapper.xml
index f8679aa5..11e72180 100644
--- a/dxhy-core/src/main/resources/mapper/SgqsMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/SgqsMapper.xml
@@ -38,7 +38,7 @@
         qs_status = '0' and source_system='0'
         and t.gf_tax_no = #{gfsh}
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and businessCode != '99' ">
-            and comp_code = #{companyCode}
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and invoice_type = #{invoiceType}
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 3c856b6f..556b1b68 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
@@ -370,7 +370,9 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl<ExtTdxRec
         BigDecimal sumTaxAmount = new BigDecimal(0);
         for (ExtTdxRecordInvoice record : sumList) {
             sumInvoiceAmount = sumInvoiceAmount.add(record.getInvoiceAmount());
-            sumTaxAmount = sumTaxAmount.add(record.getTaxAmount());
+            if(record.getTaxAmount() != null) {
+                sumTaxAmount = sumTaxAmount.add(record.getTaxAmount());
+            }
         }
         result.put("sumInvoiceAmount",
             AmountFormatUtil.fmtMicrometer(MathUtil.round(sumInvoiceAmount.toPlainString())));