mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 20:52:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进中间表模型的实例化

Browse Source
This commit is contained in:
thinkphp
2017-11-21 15:17:52 +08:00
parent 1bbf37a20b
commit c38d2a6d0d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/db/Query.php
View File

@@ -2361,8 +2361,8 @@ class Query
if (count($resultSet) > 0) {
foreach ($resultSet as $key => $result) {
/** @var Model $model */
$model = new $modelName($result);
$model->isUpdate(true);
$model = new $modelName();
$model->data($result)->isUpdate(true);
// 关联查询
if (!empty($options['relation'])) {
@@ -2518,8 +2518,8 @@ class Query
if (!empty($this->model)) {
// 返回模型对象
$model = $this->model;
$result = new $model($result);
$result->isUpdate(true, isset($options['where']['AND']) ? $options['where']['AND'] : null);
$result = new $model();
$result->data($result)->isUpdate(true, isset($options['where']['AND']) ? $options['where']['AND'] : null);
// 关联查询
if (!empty($options['relation'])) {
$result->relationQuery($options['relation']);