From 522a475627f97911deb6f4a7dc85dedd13b5888c Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 4 Jul 2023 18:17:09 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseInvoiceController.java     | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

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 8ffaa74b..0dacf005 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)) {
@@ -504,6 +510,9 @@ public class BaseInvoiceController extends AbstractController {
         String qsksrq = (String)map.get("qsksrq");
         String qsjsrq = (String)map.get("qsjsrq");
         String xfmc = (String)map.get("xfmc");
+        String sortPzbh = String.valueOf(map.get("sortPzbh"));
+        String sortBzdh = String.valueOf(map.get("sortBzdh"));
+        String sortKprq = String.valueOf(map.get("sortKprq"));
         String position = (String)map.get("position");
         String fpzt = (String)map.get("invoiceStatus");
         String sfkrz = (String)map.get("sfkrz");
@@ -561,6 +570,16 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("suspendStatus",suspendStatus);
         pramsMap.put("suspendDate",suspendDate);
         pramsMap.put("bzr",bzr);
+        if(StringUtils.isNotEmpty(sortPzbh)) {
+            pramsMap.put("sortPzbh", sortPzbh);
+        }
+        if(StringUtils.isNotEmpty(sortBzdh)) {
+            pramsMap.put("sortBzdh", sortBzdh);
+        }
+        if(StringUtils.isNotEmpty(sortKprq)) {
+            pramsMap.put("sortKprq", sortKprq);
+        }
+
         if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) {
             String accountPeriod = map.get("accountPeriod").toString().substring(0,7);
             pramsMap.put("accountPeriod", accountPeriod);