修正Merge模型

2026-07-01 12:42:48 +08:00 · 2016-06-22 22:28:41 +08:00
parent 13103c84c7
commit 62de83358a
1 changed files with 3 additions and 3 deletions
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -250,7 +250,7 @@ class Merge extends Model
            return $result;
        } catch (\Exception $e) {
            $db->rollback();
-            return false;
+            throw $e;
        }
    }

@@ -283,9 +283,9 @@ class Merge extends Model
            $this->trigger('after_delete', $this);
            $db->commit();
            return $result;
-        } catch (\PDOException $e) {
+        } catch (\Exception $e) {
            $db->rollback();
-            return false;
+            throw $e;
        }
    }