Merge branches '0630-增加权限筛选' and 'test' of http://192.168.12.182/invoice/pt into test

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -510,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");
@@ -573,6 +576,16 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("sortBzdh",sortBzdh);
         pramsMap.put("sortKprq",sortKprq);
         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);