内核更新

2016-08-03 23:44:44 +08:00
parent d6e2aa4068
commit 8094b9249a
9 changed files with 181 additions and 125 deletions
--- a/core/library/think/model/Merge.php
+++ b/core/library/think/model/Merge.php
@@ -189,8 +189,12 @@ class Merge extends Model

                if (!empty($where)) {
                    $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]);
                    }
                }