From f55e7ae900d5d31690749497b800a8b7c9755596 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 14 Apr 2017 18:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3toarray=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Model.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/library/think/Model.php b/library/think/Model.php
index 0eec1037..a0d888a7 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -739,13 +739,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         $item    = [];
         $visible = [];
         $hidden  = [];
+
+        $data = array_merge($this->data, $this->relation);
+
         // 过滤属性
         if (!empty($this->visible)) {
             $array = $this->parseAttr($this->visible, $visible);
-            $data  = array_intersect_key($this->data, array_flip($array));
+            $data  = array_intersect_key($data, array_flip($array));
         } elseif (!empty($this->hidden)) {
             $array = $this->parseAttr($this->hidden, $hidden, false);
-            $data  = array_diff_key($this->data, array_flip($array));
+            $data  = array_diff_key($data, array_flip($array));
         } else {
             $data = $this->data;
         }