发票综合查询税率导出

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxslServiceImpl.java

@@ -46,9 +46,9 @@ public class FpzhcxslServiceImpl extends MpBaseServiceImpl<BbfpzhslDao, Bbfpzhsl
         DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
 
         try {
-            List<String> gfshList = (List<String>)pramsMap.get("gfsh");
+            String gfsh = (String) pramsMap.get("gfsh");
             String inAccountStatus = (String)pramsMap.get("inAccountStatus");
-            if (gfshList.size() == 0) {
+            if (StringUtils.isBlank(gfsh)) {
                 // 未从getUserInfo()获取到购方税号信息
                 json.put("hjsl", "0");
                 json.put("hjje", "0");

dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml

@@ -31,6 +31,7 @@
         where
         t.invoice_date between #{kpksrq} and #{kpjsrq}
         and t.gf_tax_no = #{gfsh}
+        and t.comp_code = #{companyCode}
         <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99' ">
             and t.invoice_status = #{invoiceStatus}
         </if>