diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
index 42d7b90d..a2058530 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
@@ -657,8 +657,9 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
         QueryWrapper<BaseTDxOutReason> query = new QueryWrapper<>();
         query.eq("reason_code", record.getOutReason());
         BaseTDxOutReason reason = baseTDxOutReasonDao.selectOne(query);
-        if (StringUtils.isNotEmpty(reason.getOutReason()))
+        if (reason != null && StringUtils.isNotEmpty(reason.getOutReason())) {
             vo.setReason(reason.getOutReason());
+        }
         // 认证日期 string类型的长日期转为string类型的短日期
         String certDate = record.getCertDate();
         Date date = new Date();
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 74208fa1..f3a37054 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,15 +57,15 @@ 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", ""));
-//            }
-//        }
-        gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+        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());
         boolean flag = checkList(gfshList);
         if (flag){
             pramsMap.put("sign","88");
@@ -113,13 +113,13 @@ public class ExtInvoicePoolController extends AbstractController {
         if(StringUtils.isNotEmpty(companyCode) && !"99".equals(companyCode) && !"88".equals(companyCode)) {
             pramsMap.put("companyCode", companyCode);
             companyCodes.add(companyCode);
-            gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes);
+//            gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes);
             pramsMap.put("gfsh", gfshList);
         }else if(StringUtils.isNotEmpty(companyCode) && "99".equals(companyCode)){
             pramsMap.put("companyCode", companyCode);
             companyCodes = getUserInfo().getCompanyCodes();
             pramsMap.put("companyCodes", companyCodes);
-            gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes);
+//            gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes);
             pramsMap.put("gfsh", gfshList);
             log.info("组织机构====>{}", companyCodes);
         }else if(StringUtils.isNotEmpty(companyCode) && "88".equals(companyCode)){
@@ -230,16 +230,16 @@ 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());
+//        gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
         boolean flag = checkList(gfshList);
         if (flag){
             pramsMap.put("sign","88");