mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 23:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正Merge模型

Browse Source
This commit is contained in:
thinkphp
2016-06-22 22:28:41 +08:00
parent 13103c84c7
commit 62de83358a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/model/Merge.php
View File

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