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

修正

Browse Source
This commit is contained in:
thinkphp
2016-01-29 16:27:16 +08:00
parent 52c2cd0533
commit 5734635706
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.php
View File

@@ -308,7 +308,7 @@ class Model
public function addAll($dataList, $options = [], $replace = false) public function addAll($dataList, $options = [], $replace = false)
{ {
if (empty($dataList)) { if (empty($dataList)) {
throw new Exception('no data to write') throw new Exception('no data to write');
} }
// 数据处理 // 数据处理
foreach ($dataList as $key => $data) { foreach ($dataList as $key => $data) {
@@ -415,7 +415,7 @@ class Model
if (!empty($this->data) && isset($this->data[$pk])) { if (!empty($this->data) && isset($this->data[$pk])) {
return $this->delete($this->data[$pk]); return $this->delete($this->data[$pk]);
} else { } else {
throw new Exception('no data to delete without where'); throw new Exception('no data to delete without where');
} }
} }
if (is_numeric($options) || is_string($options)) { if (is_numeric($options) || is_string($options)) {
@@ -451,7 +451,7 @@ class Model
$options = $this->_parseOptions($options); $options = $this->_parseOptions($options);
if (empty($options['where'])) { if (empty($options['where'])) {
// 如果条件为空 不进行删除操作 除非设置 1=1 // 如果条件为空 不进行删除操作 除非设置 1=1
throw new Exception('no data to delete without where'); throw new Exception('no data to delete without where');
} }
if (isset($options['where'][$pk])) { if (isset($options['where'][$pk])) {
$pkValue = $options['where'][$pk]; $pkValue = $options['where'][$pk];