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

修正Merge模型的save方法

Browse Source
This commit is contained in:
thinkphp
2016-08-03 15:39:57 +08:00
parent e71c3630cd
commit 5dad96ab66
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,8 +189,12 @@ class Merge extends Model
if (!empty($where)) { if (!empty($where)) {
$pk = $this->getPk(); $pk = $this->getPk();
if (is_string($pk) && isset($data[$pk])) {
unset($data[$pk]); if (isset($this->mapFields[$pk])) {
$pk = $this->mapFields[$pk];
}
if (isset($where[$pk])) {
unset($where[$pk]);
} }
} }