From 9b2524d3a1d97b787bc589d5b7974920c9c4aca3 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 9 Nov 2016 16:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=90=88=E6=A8=A1=E5=9E=8B=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20field=E5=AE=9A=E4=B9=89=E9=9C=80=E8=A6=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84=E5=AD=97=E6=AE=B5?=
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 c28d0fd7..de8d9e1a 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -61,14 +61,14 @@ class Merge extends Model
     {
         $class  = new static();
         $master = $class->name;
-        $fields = self::getModelField($query, $master, '', $class->mapFields);
+        $fields = self::getModelField($query, $master, '', $class->mapFields, $class->field);
         $query->alias($master)->field($fields);
 
         foreach ($class->relationModel as $key => $model) {
             $name  = is_int($key) ? $model : $key;
             $table = is_int($key) ? $query->getTable($name) : $model;
             $query->join($table . ' ' . $name, $name . '.' . $class->fk . '=' . $master . '.' . $class->getPk());
-            $fields = self::getModelField($query, $name, $table, $class->mapFields);
+            $fields = self::getModelField($query, $name, $table, $class->mapFields, $class->field);
             $query->field($fields);
         }
         return $query;
@@ -81,12 +81,13 @@ class Merge extends Model
      * @param string            $name 模型名称
      * @param string            $table 关联表名称
      * @param array             $map 字段映射
+     * @param array             $fields 查询字段
      * @return array
      */
-    protected static function getModelField($query, $name, $table = '', $map = [])
+    protected static function getModelField($query, $name, $table = '', $map = [], $fields = [])
     {
         // 获取模型的字段信息
-        $fields = $query->getTableInfo($table, 'fields');
+        $fields = $fields ?: $query->getTableInfo($table, 'fields');
         $array  = [];
         foreach ($fields as $field) {
             if ($key = array_search($name . '.' . $field, $map)) {