diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 9ee90083..c93393e2 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -189,6 +189,9 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("voucherNumber", map.get("voucherNumber"));
         List<Tax> taxList = getUserInfo().getOrg();
         pramsMap.put("taxList", taxList);
+        if (!StringUtils.isNotBlank(gfsh)){
+            pramsMap.put("sign","88");
+        }
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
             gfshList.add(gfsh);
@@ -203,8 +206,12 @@ public class BaseInvoiceController extends AbstractController {
 //        }else {
 //            companyCodeList = getUserInfo().getCompanyCodes();
 //        }
+        if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){
+            pramsMap.put("companyCodes",getUserInfo().getCompanyCodes());
+            log.info("组织机构====>{}",pramsMap.get("companyCodes"));
+        }
         if (StringUtils.isNotBlank(companyCode)){
-            pramsMap.put("companyCodes",companyCode);
+            pramsMap.put("companyCode",companyCode);
         }
 
         if (!StringHelper.isBlank(invoiceType)) {
@@ -545,6 +552,9 @@ public class BaseInvoiceController extends AbstractController {
                 pramsMap.put("invoiceSource", invoiceSource);
             }
         }
+        if (!StringUtils.isNotBlank(gfsh)){
+            pramsMap.put("sign","88");
+        }
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
             gfshList.add(gfsh);
@@ -561,8 +571,12 @@ public class BaseInvoiceController extends AbstractController {
 //            companyCodeList = getUserInfo().getCompanyCodes();
 //            log.info("获取到的组织信息{}",companyCodeList);
 //        }
+        if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){
+            pramsMap.put("companyCodes",getUserInfo().getCompanyCodes());
+            log.info("组织机构====>{}",pramsMap.get("companyCodes"));
+        }
         if (StringUtils.isNotBlank(companyCode)){
-            pramsMap.put("companyCodes",companyCode);
+            pramsMap.put("companyCode",companyCode);
         }
 
 
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
index fe444171..8954882d 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
@@ -96,6 +96,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                     json.put("hjje", AmountFormatUtil.fmtMicrometer(hjje));
                     json.put("hjse", AmountFormatUtil.fmtMicrometer(hjse));
                 }
+
                 List<String> gfshList1 = new ArrayList<>();
                 List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh(pramsMap);
                 log.info("认证查询列表-返回的所属期列表为:{}",curList);
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 2980ff5a..3571843d 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -80,15 +80,25 @@
         and t.auth_status != '0'
         and t.rzh_yesorno != '0'
         and t.company = #{company}
-        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="companyCodes != null and companyCodes != '99' and companyCodes != '88' and companyCodes != '' and companyCodes != 'null'" >
-            and t.comp_code = #{companyCodes}
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
+            and (t.comp_code in
+            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
+                #{companyCode}
+            </foreach>
+            or t.comp_code is null or t.comp_code = ''
+            )
         </if>
-        <if test="companyCodes != null and companyCodes != ''  and companyCodes == '88'">
+        <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
+            and t.comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
             and (t.comp_code = '' or t.comp_code is null)
         </if>
 
@@ -351,14 +361,25 @@
         and t.export_mark = '0'
         and t.rzh_yesorno != '0'
         and t.company =#{company}
-        and t.gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-        <if test="companyCodes != null and companyCodes != '99' and companyCodes != '88' and companyCodes != '' and companyCodes != 'null'" >
-            and t.comp_code = #{companyCodes}
+        <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="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
+            and (t.comp_code in
+            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
+                #{companyCode}
+            </foreach>
+            or t.comp_code is null or t.comp_code = ''
+            )
+        </if>
+        <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
+            and t.comp_code = #{companyCode}
         </if>
-        <if test="companyCodes != null and companyCodes != ''  and companyCodes == '88'">
+        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
             and (t.comp_code = '' or t.comp_code is null)
         </if>
         <if  test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 3ceba96c..05bdee50 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -92,18 +92,29 @@
             c.select_end_date or d.tj_status in ('1','2'))
 
         </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>
+
 <!--        and t.comp_code in-->
 <!--        <foreach collection="companyCodes" index="index" item="companyCode" open="(" close=")" separator=",">-->
 <!--            #{companyCode}-->
 <!--        </foreach>-->
-        <if test="companyCodes != null and companyCodes != '99' and companyCodes != '88' and companyCodes != '' and companyCodes != 'null'" >
-            and t.comp_code = #{companyCodes}
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
+            and (t.comp_code in
+            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
+                #{companyCode}
+            </foreach>
+            or t.comp_code is null or t.comp_code = ''
+            )
+        </if>
+        <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
+            and t.comp_code = #{companyCode}
         </if>
-        <if test="companyCodes != null and companyCodes != ''  and companyCodes == '88'">
+        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
             and (t.comp_code = '' or t.comp_code is null)
         </if>
         <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '1'.toString()">
@@ -408,18 +419,29 @@
             c.select_end_date or d.tj_status in ('1','2'))
 
         </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>
+
 <!--        and t.comp_code in-->
 <!--        <foreach collection="companyCodes" index="index" item="companyCode" open="(" close=")" separator=",">-->
 <!--            #{companyCode}-->
 <!--        </foreach>-->
-        <if test="companyCodes != null and companyCodes != '99' and companyCodes != '88' and companyCodes != '' and companyCodes != 'null'" >
-            and t.comp_code = #{companyCodes}
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
+            and (t.comp_code in
+            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
+                #{companyCode}
+            </foreach>
+            or t.comp_code is null or t.comp_code = ''
+            )
+        </if>
+        <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
+            and t.comp_code = #{companyCode}
         </if>
-        <if test="companyCodes != null and companyCodes != ''  and companyCodes == '88'">
+        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
             and (t.comp_code = '' or t.comp_code is null)
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
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 bbcb9f87..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
@@ -57,13 +57,17 @@ public class ExtInvoicePoolController extends AbstractController {
         pramsMap.put("dbName", getUserInfo().getDbName());
 
         List<String> gfshList = new ArrayList<>();
-        if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
-            gfshList.add(pramsMap.get("gfsh").toString());
-        } else {
-            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
-            if (gfshList.size() == 0) {
-                return ResponseEntity.ok(R.ok().put("data", ""));
-            }
+//        if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
+//            gfshList.add(pramsMap.get("gfsh").toString());
+//        } else {
+//            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+//            if (gfshList.size() == 0) {
+//                return ResponseEntity.ok(R.ok().put("data", ""));
+//            }
+//        }
+        gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+        if (gfshList.size() == 0) {
+            return ResponseEntity.ok(R.ok().put("data", ""));
         }
         pramsMap.put("gfsh", gfshList);
         if (pramsMap.get("cjksyf") != null && !"".equals(pramsMap.get("cjksyf"))) {
@@ -207,14 +211,18 @@ public class ExtInvoicePoolController extends AbstractController {
         pramsMap.put("dbName", getUserInfo().getDbName());
 
         List<String> gfshList = new ArrayList<>();
-        if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
-            gfshList.add(pramsMap.get("gfsh").toString());
-        } else {
-            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
-            if (gfshList.size() == 0) {
+//        if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
+//            gfshList.add(pramsMap.get("gfsh").toString());
+//        } else {
+//            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+//            if (gfshList.size() == 0) {
+//                return ResponseEntity.ok(R.ok().put("data", ""));
+//            }
+//        }
+        gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+        if (gfshList.size() == 0) {
                 return ResponseEntity.ok(R.ok().put("data", ""));
             }
-        }
         pramsMap.put("taxno", gfshList);
         if (pramsMap.get("cjksyf") != null && !"".equals(pramsMap.get("cjksyf"))) {
             pramsMap.put("cjksyf", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("cjksyf").toString())));
diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index a3828245..8ce721fb 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -69,10 +69,10 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-<!--        and t.gf_tax_no in-->
-<!--        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">-->
-<!--            #{item}-->
-<!--        </foreach>-->
+        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>
@@ -218,10 +218,10 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-<!--        and t.gf_tax_no in-->
-<!--        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">-->
-<!--            #{item}-->
-<!--        </foreach>-->
+        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>
@@ -506,10 +506,10 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-<!--        and t.xf_tax_no in-->
-<!--        <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">-->
-<!--            #{item}-->
-<!--        </foreach>-->
+        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}
@@ -617,10 +617,10 @@
             like
             CONCAT('%',#{keyWord},'%')
         </if>
-<!--        and t.xf_tax_no in-->
-<!--        <foreach collection="taxno" index="index" item="item" open="(" separator="," close=")">-->
-<!--            #{item}-->
-<!--        </foreach>-->
+        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}