From 2d394e6017f03d2682c7e7b482a7e3a2ef55885a Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 10 May 2023 14:17:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ExtInvoicePoolController.java     |  7 +++++++
 .../resources/mapper/ExtInvoicePoolMapper.xml    | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)

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 @@
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and sn_voucher_number = #{snVoucherNumber}
         </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
+            and (comp_code in
+            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
+                #{companyCode}
+            </foreach>
+            or comp_code is null or comp_code = ''
+            )
+        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
             and comp_code = #{companyCode}
         </if>
@@ -403,6 +411,14 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and bzdh = #{bzdh}
         </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
+            and (comp_code in
+            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
+                #{companyCode}
+            </foreach>
+            or comp_code is null or comp_code = ''
+            )
+        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
             and comp_code = #{companyCode}
         </if>