|
@@ -71,14 +71,17 @@ class BaseProductCategory extends EloquentRepository
|
|
*/
|
|
*/
|
|
public function get(Grid\Model|\Dcat\Admin\Grid\Model $model)
|
|
public function get(Grid\Model|\Dcat\Admin\Grid\Model $model)
|
|
{
|
|
{
|
|
-
|
|
|
|
// 获取模型对象
|
|
// 获取模型对象
|
|
$obj = $this->model();
|
|
$obj = $this->model();
|
|
// 获取数据
|
|
// 获取数据
|
|
$tree = $obj->orderBy('order', 'desc')->orderBy('id', 'desc')->get();
|
|
$tree = $obj->orderBy('order', 'desc')->orderBy('id', 'desc')->get();
|
|
-
|
|
|
|
|
|
+ $treeData = $tree->toArray();
|
|
|
|
+ foreach ($tree as $key => $value) {
|
|
|
|
+ $treeData[$key]['baseProductParameter.name'] = $value->baseProductParameter->name?? '';
|
|
|
|
+ }
|
|
// 构建树形结构
|
|
// 构建树形结构
|
|
- $data=buildTree($tree->toArray());
|
|
|
|
|
|
+ $data=buildTree($treeData);
|
|
|
|
+
|
|
// 转换成一维数组
|
|
// 转换成一维数组
|
|
$data=flattenTree($data);
|
|
$data=flattenTree($data);
|
|
|
|
|