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

修正Model类

Browse Source
This commit is contained in:
thinkphp
2016-04-01 14:01:15 +08:00
parent 732ddff179
commit b377d97b80
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Model.php
View File

@@ -209,7 +209,7 @@ class Model
throw new Exception('invalid data'); throw new Exception('invalid data');
} }
} }
if (!empty($this->duplicate) && 'update' == $type) { if (isset($find) && !empty($this->duplicate) && 'update' == $type) {
// 存在数据副本 // 存在数据副本
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
// 去除相同数据 // 去除相同数据
@@ -220,7 +220,7 @@ class Model
if (empty($data)) { if (empty($data)) {
// 没有数据变化 // 没有数据变化
return []; return [];
} elseif (!empty($find)) { } else {
// 更新操作保留主键信息 // 更新操作保留主键信息
$pk = $this->getPk(); $pk = $this->getPk();
if (is_array($pk)) { if (is_array($pk)) {