From c4687d0b71b4c0f9fc4e2882fa0d6fd29be77b01 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Wed, 5 Jul 2023 16:12:20 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F&=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 8 ++++----
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index f1ace545..a40d60d3 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -240,16 +240,16 @@
             order by t.invoice_date desc
         </if>
         <if test="sortPzbh == 1">
-            ,t.sn_voucher_number
+            order by t.sn_voucher_number
         </if>
         <if test="sortPzbh == 2">
-            ,t.sn_voucher_number desc
+            order by t.sn_voucher_number desc
         </if>
         <if test="sortBzdh == 1">
-            ,t.bzdh
+            order by t.bzdh
         </if>
         <if test="sortBzdh == 2">
-            ,t.bzdh desc
+            order by t.bzdh desc
         </if>
 
     </select>
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index d4d1bfcc..6a25b997 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -99,7 +99,7 @@
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
-        and t.auth_status != '0'
+        and t.auth_status in ('2','3','4')
         and t.company = #{company}
         <if test="sign !='88'">
             and t.gf_tax_no in