修改无上及权限不能查询

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", ""));

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=")">
+        <if test="sign !='88'">
-            #{item}
+            and t.gf_tax_no in
-        </foreach>
+            <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
+        <if test="sign !='88'">
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
+            and t.gf_tax_no in
-            #{item}
+            <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-        </foreach>
+                #{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
+        <if test="sign !='88'">
-        <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
+            and t.xf_tax_no in
-            #{item}
+            <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
-        </foreach>
+                #{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
+        <if test="sign !='88'">
-        <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
+            and t.xf_tax_no in
-            #{item}
+            <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">
-        </foreach>
+                #{item}
+            </foreach>
+        </if>
+
         <if
                 test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}