From 5dad96ab661110c1a16f4a563d8f058acdcaecc6 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 3 Aug 2016 15:39:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Merge=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84save=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model/Merge.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php
index 1bf634f4..9a28ea9c 100644
--- a/library/think/model/Merge.php
+++ b/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]);
                     }
                 }