|
@@ -40,7 +40,7 @@ class Award extends Controller
|
|
|
left join awards_user_info as u on l.uid = u.uid
|
|
left join awards_user_info as u on l.uid = u.uid
|
|
|
left join awards_order as o on o.uid = l.uid
|
|
left join awards_order as o on o.uid = l.uid
|
|
|
left join awards_gift as g on o.gift_id = g.id
|
|
left join awards_gift as g on o.gift_id = g.id
|
|
|
-where u.portrait != '' and u.portrait is not null and l.duration > 15 group by l.uid order by l.number desc, l.duration asc limit 50");
|
|
|
|
|
|
|
+where u.portrait != '' and u.portrait is not null and l.duration > 15 group by l.uid order by l.number desc, l.duration asc, l.id asc limit 50");
|
|
|
$this->assign('lists', $lists);
|
|
$this->assign('lists', $lists);
|
|
|
$this->fetch();
|
|
$this->fetch();
|
|
|
}
|
|
}
|
|
@@ -59,7 +59,7 @@ where u.portrait != '' and u.portrait is not null and l.duration > 15 group by
|
|
|
left join awards_user_info as u on l.uid = u.uid
|
|
left join awards_user_info as u on l.uid = u.uid
|
|
|
left join awards_order as o on o.uid = l.uid
|
|
left join awards_order as o on o.uid = l.uid
|
|
|
left join awards_gift as g on o.gift_id = g.id
|
|
left join awards_gift as g on o.gift_id = g.id
|
|
|
-where u.portrait != '' and u.portrait is not null and l.duration > 15 group by l.uid order by l.number desc, l.duration asc limit 50");
|
|
|
|
|
|
|
+where u.portrait != '' and u.portrait is not null and l.duration > 15 group by l.uid order by l.number desc, l.duration asc, l.id asc limit 50");
|
|
|
|
|
|
|
|
//实例化
|
|
//实例化
|
|
|
$objExcel = new \PHPExcel();
|
|
$objExcel = new \PHPExcel();
|