|
...
|
...
|
@@ -495,7 +495,8 @@ class Sun extends Api |
|
|
|
$Info = Db::name('sun')
|
|
|
|
->alias('s')
|
|
|
|
->order('p.weigh asc')
|
|
|
|
->order('s.id desc')
|
|
|
|
// ->order('s.id desc')
|
|
|
|
->order('t.id desc')
|
|
|
|
->where($Map)
|
|
|
|
->join('time t', 't.id=s.time_id')
|
|
|
|
->join('plane p', 'p.id=s.plane_id')
|
|
...
|
...
|
@@ -506,7 +507,8 @@ class Sun extends Api |
|
|
|
$Info = Db::name('sun')
|
|
|
|
->alias('s')
|
|
|
|
->order('p.weigh asc')
|
|
|
|
->order('s.id desc')
|
|
|
|
// ->order('s.id desc')
|
|
|
|
->order('t.id desc')
|
|
|
|
->where($Map)
|
|
|
|
->join('time t', 't.id=s.time_id')
|
|
|
|
->where('t.id', 'NEQ', 12)
|
...
|
...
|
|
