|
...
|
...
|
@@ -35,11 +35,14 @@ class DetailController extends BaseController |
|
|
|
$data_column = $column->list([],'id',['*'],'asc');
|
|
|
|
if(!empty($data_column) && !empty($data)){
|
|
|
|
foreach ($data_column as $k => $v){
|
|
|
|
foreach ($data as $k1 => $v1){
|
|
|
|
$column_data = [];
|
|
|
|
foreach ($data as $v1){
|
|
|
|
if($v['id'] == $v1['column_id']){
|
|
|
|
$data_column[$k]['data'][] = $v1;
|
|
|
|
$column_data[] = $v1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$v['data'] = $column_data;
|
|
|
|
$data_column[$k] = $v;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$this->response('success',Code::SUCCESS,$data_column);
|
...
|
...
|
|