Merge branches '0614-增加税率筛选条件' and 'test' of http://192.168.12.182/invoice/pt into test

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

@@ -142,6 +142,7 @@ public class BaseInvoiceController extends AbstractController {
         String qsr = (String)map.get("qsr");
         String rzhr = (String)map.get("rzhr");
         String taxRate = String.valueOf(map.get("taxRate"));
+        log.info("taxRate={}",taxRate);
         String inAccountStatus = (String)map.get("inAccountStatus");
         int curr = (int)map.get("curr");
         int size = (int)map.get("size");
@@ -226,7 +227,7 @@ public class BaseInvoiceController extends AbstractController {
             pramsMap.put("companyCode",companyCode);
         }
 
-        if (!StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
+        if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
 //            List<String> rates = new ArrayList<>();
 //            rates = convertRates(taxRate,rates);
             pramsMap.put("taxRate",taxRate);