修复:进入积分商城报错
This commit is contained in:
parent
c5decc3fdf
commit
d51539a452
|
|
@ -68,7 +68,10 @@ class GroupDataDao extends BaseDao
|
|||
if (!is_null($page)) $query->page($page, $limit);
|
||||
$groupData = [];
|
||||
foreach ($query->column('value,mer_id', 'group_data_id') as $k => $v) {
|
||||
$groupData[] = json_decode($v['value'], true) + ['group_data_id' => $k, 'group_mer_id' => $v['mer_id']];
|
||||
if(is_array(json_decode($v['value'], true))) {
|
||||
$vValue = json_decode($v['value'], true);
|
||||
$groupData[] = $vValue + ['group_data_id' => $k, 'group_mer_id' => $v['mer_id']];
|
||||
}
|
||||
}
|
||||
return $groupData;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue