|
@@ -46,10 +46,9 @@ class VoteJoin extends BaseModel
|
|
|
$data = self::alias('a')
|
|
|
->where('a.vid', $id)
|
|
|
->join('user u', 'u.uid = a.uid', 'left')
|
|
|
- ->field('a.*,u.nickname,u.uid')
|
|
|
- ->order('a.status asc,a.id desc');
|
|
|
+ ->field('a.*,u.nickname,u.uid');
|
|
|
if (isset($where['export']) && $where['export'] == 1) {
|
|
|
- $list = $data->order('vote', 'desc')->select()->toArray();
|
|
|
+ $list = $data->order('a.vote desc')->select()->toArray();
|
|
|
$export = [];
|
|
|
foreach ($list as $index => $item) {
|
|
|
$user = \app\admin\model\user\User::get($item['uid']);
|
|
@@ -73,7 +72,7 @@ class VoteJoin extends BaseModel
|
|
|
->setExcelContent($export)
|
|
|
->ExcelSave();
|
|
|
}
|
|
|
- $data = $data->page((int)$where['page'], (int)$where['limit'])
|
|
|
+ $data = $data->order('a.status asc,a.id desc')->page((int)$where['page'], (int)$where['limit'])
|
|
|
->select()
|
|
|
->each(function ($item) use ($id) {
|
|
|
$user = \app\admin\model\user\User::get($item['uid']);
|