From 1d2b44adc8346aa6924c92f8d77be06445967976 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 5 Dec 2016 10:55:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Query=E7=9A=84select=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E7=9A=84=E5=85=B3=E8=81=94=E9=A2=84=E8=BD=BD=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Query.php                      | 2 +-
 library/think/model/relation/HasManyThrough.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index b6ad8ff8..4d63ba14 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -1985,7 +1985,7 @@ class Query
                 }
                 if (!empty($options['with']) && $result instanceof Model) {
                     // 预载入
-                    $resultSet = $result->eagerlyResultSet($resultSet, $options['with'], is_object($resultSet) ? get_class($resultSet) : '');
+                    $result->eagerlyResultSet($resultSet, $options['with'], is_object($resultSet) ? get_class($resultSet) : '');
                 }
             }
         } elseif (!empty($options['fail'])) {
diff --git a/library/think/model/relation/HasManyThrough.php b/library/think/model/relation/HasManyThrough.php
index 8f76f573..2661b7b3 100644
--- a/library/think/model/relation/HasManyThrough.php
+++ b/library/think/model/relation/HasManyThrough.php
@@ -13,6 +13,7 @@ namespace think\model\relation;
 
 use think\Db;
 use think\db\Query;
+use think\Loader;
 use think\Model;
 use think\model\Relation;