From f13a9a2647f62a1a042b623398da53cb02deb6ac Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 30 May 2023 22:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E4=B8=8A=E5=8F=8A?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B8=8D=E8=83=BD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ExtInvoicePoolController.java  |  9 ++++
 .../resources/mapper/ExtInvoicePoolMapper.xml | 45 ++++++++++++-------
 2 files changed, 38 insertions(+), 16 deletions(-)

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 881ce31f..71347bb3 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
@@ -65,6 +65,10 @@ public class ExtInvoicePoolController extends AbstractController {
 //                return ResponseEntity.ok(R.ok().put("data", ""));
 //            }
 //        }
+        String gfsh = (String)pramsMap.get("gfsh");
+        if (!org.apache.commons.lang.StringUtils.isNotBlank(gfsh)){
+            pramsMap.put("sign","88");
+        }
         gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
         if (gfshList.size() == 0) {
             return ResponseEntity.ok(R.ok().put("data", ""));
@@ -219,6 +223,11 @@ public class ExtInvoicePoolController extends AbstractController {
 //                return ResponseEntity.ok(R.ok().put("data", ""));
 //            }
 //        }
+        String gfsh = (String)pramsMap.get("gfsh");
+        if (!org.apache.commons.lang.StringUtils.isNotBlank(gfsh)){
+            pramsMap.put("sign","88");
+        }
+
         gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
         if (gfshList.size() == 0) {
                 return ResponseEntity.ok(R.ok().put("data", ""));
diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index 8ce721fb..3ccec1f1 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -69,10 +69,14 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-        and t.gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+
+        <if test="sign !='88'">
+            and t.gf_tax_no in
+            <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}
         </if>
@@ -218,10 +222,13 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-        and t.gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        <if test="sign !='88'">
+            and t.gf_tax_no in
+            <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}
         </if>
@@ -506,10 +513,13 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-        and t.xf_tax_no in
-        <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        <if test="sign !='88'">
+            and t.xf_tax_no in
+            <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
         <if
                 test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}
@@ -617,10 +627,13 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-        and t.xf_tax_no in
-        <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        <if test="sign !='88'">
+            and t.xf_tax_no in
+            <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
         <if
                 test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}