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

This reverts commit f13a9a26
---
 .../controller/ExtInvoicePoolController.java  |  9 ----
 .../resources/mapper/ExtInvoicePoolMapper.xml | 45 +++++++------------
 2 files changed, 16 insertions(+), 38 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 71347bb3..881ce31f 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,10 +65,6 @@ 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", ""));
@@ -223,11 +219,6 @@ 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 3ccec1f1..8ce721fb 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -69,14 +69,10 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-
-        <if test="sign !='88'">
-            and t.gf_tax_no in
-            <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
-
+        and t.gf_tax_no in
+        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}
         </if>
@@ -222,13 +218,10 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-        <if test="sign !='88'">
-            and t.gf_tax_no in
-            <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
-
+        and t.gf_tax_no in
+        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}
         </if>
@@ -513,13 +506,10 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-        <if test="sign !='88'">
-            and t.xf_tax_no in
-            <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
-
+        and t.xf_tax_no in
+        <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
         <if
                 test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}
@@ -627,13 +617,10 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-        <if test="sign !='88'">
-            and t.xf_tax_no in
-            <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
-
+        and t.xf_tax_no in
+        <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
         <if
                 test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}