From 550403b9abf08f80004e4a72fbfdbd55edbb8525 Mon Sep 17 00:00:00 2001
From: Ying <coolsec@foxmail.com>
Date: Thu, 6 Jul 2023 14:27:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5xls?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/BaseController.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/BaseController.php b/app/BaseController.php
index dd03c6d..5db0b4e 100644
--- a/app/BaseController.php
+++ b/app/BaseController.php
@@ -229,7 +229,7 @@ class BaseController
 
         try {
             // 实例化Excel对象
-            $fileType = IOFactory::identify($filePath);
+            $fileType = IOFactory::identify($resource);
             $reader = IOFactory::createReader($fileType);
             $reader->setReadDataOnly(true);
             $spreadsheet = $reader->load($resource);
@@ -243,7 +243,7 @@ class BaseController
 
         // 数据量最小为1条
         $listRows = count($listSheetData);
-        if ($listRows <= 2) {
+        if ($listRows < 2) {
             return $this->error('数据行最小为2！');
         }
 
@@ -314,7 +314,7 @@ class BaseController
      */
     public function export(): Response
     {
-        if (\request()->isAjax()) {
+//        if (\request()->isAjax()) {
 
             // 获取分页
             $page = input('page', 1);
@@ -338,9 +338,9 @@ class BaseController
 
             $downUrl = str_replace(public_path(), '', $filePath);
             return $this->success('导出成功！', $downUrl);
-        }
+//        }
 
-        return $this->error('非法请求！');
+//        return $this->error('非法请求！');
     }
 
     /**