|
...
|
...
|
@@ -489,9 +489,9 @@ class Sun extends Api |
|
|
|
if (strtotime($Date) > $Debug || strtotime($Date) == $Debug) {
|
|
|
|
$Info = Db::name('sun')
|
|
|
|
->alias('s')
|
|
|
|
->order('p.weigh asc')
|
|
|
|
->order('s.id desc')
|
|
|
|
// ->order('t.id desc')
|
|
|
|
->order('s.createtime desc,p.id,t.id desc')
|
|
|
|
// ->order('p.weigh asc')
|
|
|
|
// ->order('s.id desc')
|
|
|
|
->where($Map)
|
|
|
|
->join('time t', 't.id=s.time_id')
|
|
|
|
->join('plane p', 'p.id=s.plane_id')
|
|
...
|
...
|
@@ -501,9 +501,10 @@ class Sun extends Api |
|
|
|
} else {
|
|
|
|
$Info = Db::name('sun')
|
|
|
|
->alias('s')
|
|
|
|
->order('p.weigh asc')
|
|
|
|
->order('s.id desc')
|
|
|
|
// ->order('t.id desc')
|
|
|
|
|
|
|
|
->order('s.createtime desc,p.id,t.id desc')
|
|
|
|
// ->order('p.weigh asc')
|
|
|
|
// ->order('s.id desc')
|
|
|
|
->where($Map)
|
|
|
|
->join('time t', 't.id=s.time_id')
|
|
|
|
->where('t.id', 'NEQ', 12)
|
...
|
...
|
|
