From 94c1ffb986eec184129a21e743e91c373c897628 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 25 Apr 2016 19:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BModel=E7=B1=BB=E7=9A=84toArra?=
 =?UTF-8?q?y=E6=96=B9=E6=B3=95=20=E6=94=AF=E6=8C=81=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=99=A8=E8=AF=BB=E5=8F=96=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Model.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/think/Model.php b/library/think/Model.php
index 4419d584..5a519025 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -152,15 +152,18 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         $item = [];
         foreach ($this->data as $key => $val) {
             if ($val instanceof Model) {
+                // 关联模型对象
                 $item[$key] = $val->toArray();
-            } elseif (is_array($val) && $val[0] instanceof Model) {
+            } elseif (is_array($val) && isset($val[0]) && $val[0] instanceof Model) {
+                // 关联模型数据集
                 $data = [];
                 foreach ($val as $k => $value) {
                     $data[$k] = $value->toArray();
                 }
                 $item[$key] = $data;
-            } elseif (is_scalar($val)) {
-                $item[$key] = $val;
+            } else {
+                // 模型属性
+                $item[$key] = $this->$key;
             }
         }
         return !empty($item) ? $item : [];