diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxslServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxslServiceImpl.java index fba93e3d..d9963d36 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxslServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxslServiceImpl.java @@ -46,9 +46,9 @@ public class FpzhcxslServiceImpl extends MpBaseServiceImpl gfshList = (List)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"); diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml index dae7676b..de85e2d9 100644 --- a/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml +++ b/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} and t.invoice_status = #{invoiceStatus}