From 321b4a92516598c4f253721807e5141154663065 Mon Sep 17 00:00:00 2001
From: liuzhaowei55 <liuzhaowei55@gmail.com>
Date: Wed, 16 Dec 2015 13:32:10 +0800
Subject: [PATCH] update thinkphp/library/think/model.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联模型查询修复
---
 library/think/model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/think/model.php b/library/think/model.php
index ddb15f9e..ddc4ca85 100644
--- a/library/think/model.php
+++ b/library/think/model.php
@@ -479,7 +479,7 @@ class Model
             }
 
             // 数据列表读取后的处理
-            $resultSet = $this->_read_datalist($resultSet);
+            $resultSet = $this->_read_datalist($resultSet, $options);
             if (isset($options['index'])) {
                 // 对数据集进行索引
                 $index = explode(',', $options['index']);
@@ -508,10 +508,10 @@ class Model
      * @param array $data 当前数据
      * @return array
      */
-    protected function _read_datalist($resultSet)
+    protected function _read_datalist($resultSet, $options)
     {
         $resultSet = array_map([$this, '_read_data'], $resultSet);
-        $this->_after_select($resultSet);
+        $this->_after_select($resultSet, $options);
         return $resultSet;
     }
     // 查询成功后的回调方法