|
|
@@ -44,7 +44,7 @@ class Award extends Controller
|
|
|
|
|
|
$lists = Db::query("select o.id, u.uid,u.nickname, o.name, o.mobile, o.address, g.name as giftName, o.rank from awards_order as o
|
|
|
left join awards_user_info as u on o.uid = u.uid
|
|
|
- left join awards_gift as g on o.gift_id = g.id where o.type = 2 order by o.rank asc");
|
|
|
+ left join awards_gift as g on o.gift_id = g.id where o.type = 2 and o.rank > 0 order by o.rank asc");
|
|
|
$this->assign('lists', $lists);
|
|
|
$this->fetch();
|
|
|
}
|
|
|
@@ -62,7 +62,7 @@ class Award extends Controller
|
|
|
|
|
|
$data = Db::query("select u.uid, u.nickname, o.name, o.mobile, o.address, g.name as giftName, o.rank from awards_order as o
|
|
|
left join awards_user_info as u on o.uid = u.uid
|
|
|
- left join awards_gift as g on o.gift_id = g.id where o.type = 2 order by o.rank asc");
|
|
|
+ left join awards_gift as g on o.gift_id = g.id where o.type = 2 and o.rank > 0 order by o.rank asc");
|
|
|
|
|
|
//实例化
|
|
|
$objExcel = new \PHPExcel();
|