mirror of
https://gitee.com/fastadminnet/framework.git
synced 2026-07-01 20:52:48 +08:00
update thinkphp/library/think/model.php
关联模型查询修复
This commit is contained in:
@@ -479,7 +479,7 @@ class Model
|
||||
}
|
||||
|
||||
// 数据列表读取后的处理
|
||||
$resultSet = $this->_read_datalist($resultSet);
|
||||
$resultSet = $this->_read_datalist($resultSet, $options);
|
||||
if (isset($options['index'])) {
|
||||
// 对数据集进行索引
|
||||
$index = explode(',', $options['index']);
|
||||
@@ -508,10 +508,10 @@ class Model
|
||||
* @param array $data 当前数据
|
||||
* @return array
|
||||
*/
|
||||
protected function _read_datalist($resultSet)
|
||||
protected function _read_datalist($resultSet, $options)
|
||||
{
|
||||
$resultSet = array_map([$this, '_read_data'], $resultSet);
|
||||
$this->_after_select($resultSet);
|
||||
$this->_after_select($resultSet, $options);
|
||||
return $resultSet;
|
||||
}
|
||||
// 查询成功后的回调方法
|
||||
|
||||
Reference in New Issue
Block a user