From c045e678acd4d9fa8dfad783690c1dcc969ae0c8 Mon Sep 17 00:00:00 2001
From: cmz <phpreaper@163.com>
Date: Tue, 27 Aug 2024 21:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BD=95=E5=85=A5=E5=BA=8A?=
 =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Imports/BedFirstSheetImport.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Imports/BedFirstSheetImport.php b/app/Imports/BedFirstSheetImport.php
index 8a3ec2e..fe8b367 100644
--- a/app/Imports/BedFirstSheetImport.php
+++ b/app/Imports/BedFirstSheetImport.php
@@ -251,16 +251,17 @@ class BedFirstSheetImport implements ToCollection, WithBatchInserts, WithChunkRe
 
             DB::commit();
         }catch (\PDOException $e){
-            DB::rollBack();
+
             if ($e->getCode() === '23000') {
                 // 唯一性约束错误处理逻辑
-                $errorMessage = "导入表格中存在已入库学生信息,请勿重复导入";
+                $errorMessage = "导入表格中存在已入库床位信息,请勿重复导入";
                 // 可以根据需要进行相关处理
                 throw new \Exception($errorMessage);
             } else {
                 // 其他类型的错误处理逻辑
                 throw new \Exception("导入数据失败2,请重试");
             }
+            DB::rollBack();
         }catch (\Exception $e){
             DB::rollBack();
             throw new \Exception("导入数据失败3,请重试");