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

修正Model类 数据副本比较的时候一处警告错误

Browse Source
This commit is contained in:
thinkphp
2016-02-18 11:17:01 +08:00
parent 8c1c58cc4e
commit fc2a7b4809
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/think/Model.php
View File

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