From c3ba1e62c725a2efe25fb3c5fecbc83c9a16dbea Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 19 Jan 2018 09:06:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=B1=BBtoCollection?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E6=95=B0=E6=8D=AE=E9=9B=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model/concern/Conversion.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/think/model/concern/Conversion.php b/library/think/model/concern/Conversion.php
index b6c7cd647a..697e495bf3 100644
--- a/library/think/model/concern/Conversion.php
+++ b/library/think/model/concern/Conversion.php
@@ -223,13 +223,15 @@ public function jsonSerialize()
      * 转换数据集为数据集对象
      * @access public
      * @param  array|Collection $collection 数据集
+     * @param  string           $resultSetType 数据集类
      * @return Collection
      */
-    public function toCollection($collection)
+    public function toCollection($collection, $resultSetType = null)
     {
-        if ($this->resultSetType && false !== strpos($this->resultSetType, '\\')) {
-            $class      = $this->resultSetType;
-            $collection = new $class($collection);
+        $resultSetType = $resultSetType ?: $this->resultSetType;
+
+        if ($resultSetType && false !== strpos($resultSetType, '\\')) {
+            $collection = new $resultSetType($collection);
         } else {
             $collection = new ModelCollection($collection);
         }