...
|
...
|
@@ -371,6 +371,8 @@ class Index extends Api |
|
|
->join('planename p', 'p.id=s.plane_type')
|
|
|
->field('s.id as fid,p.name as fname,s.plane_type as fplane_type,s.status as fstatus,s.user_id as fuser_id')
|
|
|
->select();
|
|
|
dump($shangwu3);
|
|
|
die;
|
|
|
foreach ($shangwu3 as $k => $v) {
|
|
|
if ($v['fuser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['fuser_id']])->find();
|
...
|
...
|
@@ -401,9 +403,6 @@ class Index extends Api |
|
|
$shangwu4[$k]['fvip'] = null;
|
|
|
}
|
|
|
}
|
|
|
dump($shangwu3);
|
|
|
dump($shangwu4);
|
|
|
die;
|
|
|
foreach ($shangwu1 as $key => $vo) {
|
|
|
$up1[] = array_merge($vo, $shangwu2[$key]);
|
|
|
}
|
...
|
...
|
|