|
|
@@ -258,8 +258,8 @@ class MasterService extends BaseService
|
|
|
->leftJoin('member as m','m.id','=','ma.user_id')
|
|
|
->where(['ma.status'=> 1,'m.mark'=> 1,'m.status'=> 1,'ma.master_uid'=> $masterUid])
|
|
|
->where('m.id','>', 0)
|
|
|
- ->select('ms.*','m.nickname','m.avatar')
|
|
|
- ->orderBy('ms.create_time', 'desc')
|
|
|
+ ->select('ma.*','m.nickname','m.avatar')
|
|
|
+ ->orderBy('ma.create_time', 'desc')
|
|
|
->paginate($pageSize);
|
|
|
|
|
|
$dataList = $dataList ? $dataList->toArray() : [];
|