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

update thinkphp/library/think/model.php

Browse Source 
关联模型查询修复
This commit is contained in:
liuzhaowei55
2015-12-16 13:32:10 +08:00
parent 6e9dc16d35
commit 321b4a9251
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/model.php
View File

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