diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
index 84b58eb1..67e0afdb 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
@@ -10,7 +10,9 @@ import javax.annotation.Resource;
import com.dxhy.auth.client.annotation.IgnoreClientToken;
import com.dxhy.auth.client.annotation.IgnoreUserToken;
+import com.dxhy.common.util.StringHelper;
import com.dxhy.common.vo.TaxOrgCode;
+import com.dxhy.common.vo.UserInfo;
import com.dxhy.extend.entity.PullRecordReq;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
@@ -169,6 +171,11 @@ public class ExtInvoicePoolController extends AbstractController {
pramsMap.put("accountPeriod", accountPeriod);
log.info("accountPeriod:{}",accountPeriod);
}
+ String companyCode = (String) pramsMap.get("companyCode");
+ if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){
+ pramsMap.put("companyCodes",getUserInfo().getCompanyCodes());
+ log.info("组织编码===>{}", pramsMap.get("companyCodes"));
+ }
int curr = (int)pramsMap.get("curr");
int size = (int)pramsMap.get("size");
try {
diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index 977a6a89..2633ad82 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -317,6 +317,14 @@
and sn_voucher_number = #{snVoucherNumber}
+
+ and (comp_code in
+
+ #{companyCode}
+
+ or comp_code is null or comp_code = ''
+ )
+
and comp_code = #{companyCode}
@@ -403,6 +411,14 @@
and bzdh = #{bzdh}
+
+ and (comp_code in
+
+ #{companyCode}
+
+ or comp_code is null or comp_code = ''
+ )
+
and comp_code = #{companyCode}