|
...
|
...
|
@@ -78,9 +78,15 @@ class TestController extends WeChatBaseController |
|
|
|
->where(['l.area_id'=>$param['id']])
|
|
|
|
->select()->toArray();
|
|
|
|
$arr=[];
|
|
|
|
foreach ($data as $k=>$v){
|
|
|
|
array_push($arr,$v);
|
|
|
|
$row=Db::name('light')->where('area_id',$param['id'])->distinct(true)->column('row');
|
|
|
|
foreach ($row as $k1=>$v1){
|
|
|
|
array_push($arr,$v1);
|
|
|
|
foreach ($data as $k=>$v){
|
|
|
|
if ($v['row']==$arr[$k1])
|
|
|
|
array_push($arr[$k1],$v);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
print_r($arr);
|
|
|
|
}
|
|
|
|
} |
...
|
...
|
|
