From b983639657068a55e014422712692d5956ace3a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Tue, 5 Sep 2023 22:47:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml | 4 ++--
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml     | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index d38ba5d4..8b498e43 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -354,7 +354,7 @@
             and t.account_period = #{accountPeriod}
         </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
     </select>
     <!--销项票池查询-->
@@ -452,7 +452,7 @@
             and t.invoice_source = #{invoiceSource}
         </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and (t.comp_code = #{companyCode} and t.comp_code = '' or t.comp_code is null)
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
         GROUP BY t.uuid
         ORDER BY t.create_date DESC
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 780b5797..c11cce0b 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -722,6 +722,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
+        <if test="taxRate!=null and taxRate!='' and taxRate!='多税率' and taxRate != null and taxRate !='99'">
+            and t.tax_rate = #{taxRate}
+        </if>
+        <if test="taxRate=='多税率'">
+            and t.tax_rate like '%,%'
+        </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             order by t.qs_date desc,t.invoice_date desc
         </if>