|
@@ -167,18 +167,17 @@ class UserBill extends BaseModel
|
|
|
$model = $model->where('type', 'brokerage,extract')->where('pm', 0);
|
|
|
break;
|
|
|
}
|
|
|
-// var_dump('2.3');
|
|
|
+
|
|
|
if ($page) $model = $model->page((int)$page, (int)$limit);
|
|
|
$list = ($list = $model->select()) ? $list->toArray() : [];
|
|
|
$data = [];
|
|
|
- /* var_dump('2.3.1');
|
|
|
- var_dump($model);*/
|
|
|
+ var_dump('2.3.1');
|
|
|
foreach ($list as $item) {
|
|
|
-// var_dump('2.4');
|
|
|
+ var_dump('2.4');
|
|
|
$value['time'] = $item['time'];
|
|
|
- $value['list'] = self::where('uid', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm,status')->order('add_time DESC')->select();
|
|
|
+ $value['list'] = self::where('admin_id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm,status')->order('add_time DESC')->select();
|
|
|
array_push($data, $value);
|
|
|
- // var_dump('2.5');
|
|
|
+ var_dump('2.5');
|
|
|
}
|
|
|
return $data;
|
|
|
}
|