diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index bd6e48f6..8389c022 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -172,9 +172,15 @@ public class BaseInvoiceController extends AbstractController {
pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
pramsMap.put("company", map.get("company"));
pramsMap.put("menuId", map.get("menuId"));
- pramsMap.put("sortPzbh",sortPzbh);
- pramsMap.put("sortBzdh",sortBzdh);
- pramsMap.put("sortKprq",sortKprq);
+ if(StringUtils.isNotEmpty(sortPzbh)) {
+ pramsMap.put("sortPzbh", sortPzbh);
+ }
+ if(StringUtils.isNotEmpty(sortBzdh)) {
+ pramsMap.put("sortBzdh", sortBzdh);
+ }
+ if(StringUtils.isNotEmpty(sortKprq)) {
+ pramsMap.put("sortKprq", sortKprq);
+ }
pramsMap.put("xfmc", xfmc);
pramsMap.put("qsr", qsr);
if (StringUtils.isNotBlank(rzhr)) {
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 1ec579eb..374fb859 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -244,19 +244,19 @@
order by t.sn_voucher_number
-
+
order by t.sn_voucher_number desc
order by t.bzdh
-
+
order by t.bzdh desc
order by t.invoice_date
-
+
order by t.invoice_date desc
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index bfff6b16..4a35035a 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -94,6 +94,12 @@
c.select_end_date or d.tj_status in ('1','2'))
+
+ and t.bzdh = #{bzdh}
+
+
+ and t.bzdh is not null
+
and t.gf_tax_no in
@@ -133,12 +139,7 @@
and t.qs_status = #{qszt}
-
- and t.bzdh = #{bzdh}
-
-
- and t.bzdh is not null
-
+
and t.inaccount_status = #{inAccountStatus}
@@ -235,19 +236,19 @@
order by t.sn_voucher_number
-
+
order by t.sn_voucher_number desc
order by t.bzdh
-
+
order by t.bzdh desc
order by t.invoice_date
-
+
order by t.invoice_date desc