From 615affdd390156f2aaebb561524bbf0e2fd379cd Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 18 May 2023 19:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=89=8B=E5=B7=A5=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index aebfad4c..012f5cbd 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -524,13 +524,13 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        <if test="companyCodes != null and companyCodes != '99' and companyCodes != '88' and companyCodes != '' and companyCodes != 'null'" >
-            and t.comp_code = #{companyCodes}
+        <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
+            and t.comp_code = #{companyCode}
         </if>
-        <if test="companyCodes != null and companyCodes != ''  and companyCodes == '88'">
+        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
             and (t.comp_code = '' or t.comp_code is null)
         </if>
-        <if test="qszt != null and qszt != '' and qszt != 'null' ">
+        <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
@@ -557,7 +557,7 @@
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType == '14' ">
             and t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08')
         </if>
-        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '14' ">
+        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '14' and invoiceType != '99'">
             and t.invoice_type = #{invoiceType}
         </if>
         <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='null' and invoiceSource!='99'">
@@ -566,7 +566,7 @@
         <if test="fpzt != null and fpzt != '' and fpzt != 'null'">
             and t.invoice_status = #{fpzt}
         </if>
-        <if test="qsfs != null and qsfs != '' and qsfs != 'null' ">
+        <if test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99'">
             and t.qs_type = #{qsfs}
         </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">