From f4182cf38f6b3b977dcb7799accd8371802b8cb2 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 22 May 2016 13:41:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BMerge=E7=9A=84save=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model/Merge.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php
index 66b11c85..11548ae6 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -170,9 +170,6 @@ class Merge extends Model
             $this->__set($this->updateTime, null);
         }
 
-        // 处理模型数据
-        $data = $this->parseData($this->name, $this->data);
-
         $db = $this->db();
         $db->startTrans('merge_save_' . $this->name);
         try {
@@ -184,6 +181,8 @@ class Merge extends Model
                     return false;
                 }
 
+                // 处理模型数据
+                $data = $this->parseData($this->name, $this->data);
                 // 写入主表数据
                 $result = $db->strict(false)->update($data);
 
@@ -211,8 +210,10 @@ class Merge extends Model
                     return false;
                 }
 
+                // 处理模型数据
+                $data = $this->parseData($this->name, $this->data);
                 // 写入主表数据
-                $result = $db->name($this->name)->strict(false)->insert($this->data);
+                $result = $db->name($this->name)->strict(false)->insert($data);
                 if ($result) {
                     $insertId = $db->getLastInsID();
                     // 写入外键数据