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 5943b0fc..84bad887 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
@@ -926,64 +926,26 @@ public class BaseInvoiceController extends AbstractController {
 
         Map<String, Object> pramsMap = new HashMap<>(16);
 
-        if ("N".equalsIgnoreCase(isChooseAll)){
-            String uuids = (String) map.get("uuids");
-
-            if (StringUtils.isBlank(uuids)){
-                return ResponseEntity.ok(R.error("所选发票不能为空"));
-            }
-
-            String dkses = (String) map.get("dkses");
-
-            if (StringUtils.isBlank(dkses)){
-                return ResponseEntity.ok(R.error("所选发票抵扣税额不能为空"));
-            }
-
-            String gxType = (String) map.get("gxType");
-
-            if (StringUtils.isBlank(gxType)){
-                return ResponseEntity.ok(R.error("所选发票勾选类型不能为空"));
-            }
-
-            pramsMap.put("name", getUserName());
-            pramsMap.put("dbName", getUserInfo().getDbName());
-            pramsMap.put("loginName", getLoginName());
-            pramsMap.put("userName", getUserName());
-            pramsMap.put("uuids", uuids);
-            pramsMap.put("dkses",dkses);
-            pramsMap.put("gxType", gxType);
-            List<String> gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
-
-            if (!gfshList.isEmpty()) {
-                pramsMap.put("gfsh", gfshList);
-            } else {
-                return ResponseEntity.ok(R.error("购方信息不能为空！"));
-            }
-
-
-
-
+        String companyCode = (String) map.get("companyCode");
+        String gfsh = (String)map.get("gfsh");
+        List<String> gfshList = new ArrayList<>();
+        if(StringUtils.isBlank(gfsh) && "99".equals(gfsh)){
+            gfshList=UserInfoUtil.getGfshAll(getUserInfo().getOrg());
         }else {
-            String companyCode = (String) map.get("companyCode");
-            String gfsh = (String)map.get("gfsh");
-            List<String> gfshList = new ArrayList<>();
-            if(StringUtils.isBlank(gfsh) && "99".equals(gfsh)){
-                gfshList=UserInfoUtil.getGfshAll(getUserInfo().getOrg());
-            }else {
-                gfshList.add(gfsh);
-            }
-            String gxType = (String) map.get("gxType");
+            gfshList.add(gfsh);
+        }
+        String gxType = (String) map.get("gxType");
 
-            if (StringUtils.isBlank(gxType)){
-                return ResponseEntity.ok(R.error("所选发票勾选类型不能为空"));
-            }
+        if (StringUtils.isBlank(gxType)){
+            return ResponseEntity.ok(R.error("所选发票勾选类型不能为空"));
+        }
 
-            map.put("business", getUserInfo().getBusiness());
-            map.put("dbName", getUserInfo().getDbName());
-            List<Tax> taxList = getUserInfo().getOrg();
-            map.put("taxList", taxList);
-            map.put("gfsh",gfshList);
-            map.put("qsflag", getUserInfo().getQsStatus());
+        map.put("business", getUserInfo().getBusiness());
+        map.put("dbName", getUserInfo().getDbName());
+        List<Tax> taxList = getUserInfo().getOrg();
+        map.put("taxList", taxList);
+        map.put("gfsh",gfshList);
+        map.put("qsflag", getUserInfo().getQsStatus());
 //            List<String> gfshList = new ArrayList<>();
 //            if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
 //                gfshList.add(gfsh);
@@ -998,39 +960,36 @@ public class BaseInvoiceController extends AbstractController {
 //            map.put("sign","88");
 
 
-            if (StringUtils.isNotBlank(companyCode)){
-                pramsMap.put("companyCode",companyCode);
-            }
-            String sgrzzngxcx = baseInvoiceManualCheckService.inTellingCheck(map);
-            String encode = Base64.decodeStr(sgrzzngxcx);
-            BaseReturnEntity baseReturnEntity = JSON.parseObject(encode, BaseReturnEntity.class);
-            List<BaseTDxRecordInvoice> dataList = baseReturnEntity.getDataList();
-            StringBuilder uuids = new StringBuilder();
-            StringBuilder dkses = new StringBuilder();
-            if (dataList != null && dataList.size() > 0){
-                for (int i = 0; i < dataList.size(); i++) {
-                    uuids.append(dataList.get(i).getUuid());
-                    dkses.append(dataList.get(i).getTaxAmount());
-                    if (i<dataList.size()-1){
-                        uuids.append(",");
-                        dkses.append(",");
-                    }
+        if (StringUtils.isNotBlank(companyCode)){
+            pramsMap.put("companyCode",companyCode);
+        }
+        String sgrzzngxcx = baseInvoiceManualCheckService.inTellingCheck(map);
+        String encode = Base64.decodeStr(sgrzzngxcx);
+        BaseReturnEntity baseReturnEntity = JSON.parseObject(encode, BaseReturnEntity.class);
+        List<BaseTDxRecordInvoice> dataList = baseReturnEntity.getDataList();
+        StringBuilder uuids = new StringBuilder();
+        StringBuilder dkses = new StringBuilder();
+        if (dataList != null && dataList.size() > 0){
+            for (int i = 0; i < dataList.size(); i++) {
+                uuids.append(dataList.get(i).getUuid());
+                dkses.append(dataList.get(i).getTaxAmount());
+                if (i<dataList.size()-1){
+                    uuids.append(",");
+                    dkses.append(",");
                 }
-            }else {
-                return ResponseEntity.ok(R.error("没有可操作的数据"));
-
             }
-            pramsMap.put("uuids",uuids);
-            pramsMap.put("dkses",dkses);
-            pramsMap.put("name", getUserName());
-            pramsMap.put("dbName", getUserInfo().getDbName());
-            pramsMap.put("loginName", getLoginName());
-            pramsMap.put("userName", getUserName());
-            pramsMap.put("gxType", gxType);
-            pramsMap.put("gfsh", gfshList);
-
+        }else {
+            return ResponseEntity.ok(R.error("没有可操作的数据"));
 
         }
+        pramsMap.put("uuids",uuids);
+        pramsMap.put("dkses",dkses);
+        pramsMap.put("name", getUserName());
+        pramsMap.put("dbName", getUserInfo().getDbName());
+        pramsMap.put("loginName", getLoginName());
+        pramsMap.put("userName", getUserName());
+        pramsMap.put("gxType", gxType);
+        pramsMap.put("gfsh", gfshList);
 
         try {
             return ResponseEntity