|
@@ -53,11 +53,11 @@ class UserPointEntity extends BaseEntity
|
|
|
public function getUserList(array $params, array $pageAndLimit): Paginator
|
|
public function getUserList(array $params, array $pageAndLimit): Paginator
|
|
|
{
|
|
{
|
|
|
return $this->alias('l')
|
|
return $this->alias('l')
|
|
|
- ->leftJoin('user u', 'u.id = l.user_id')
|
|
|
|
|
|
|
+ ->rightJoin('user u', 'u.id = l.user_id')
|
|
|
->withSearch(['keyword' => function (Query $query, string $keyword) {
|
|
->withSearch(['keyword' => function (Query $query, string $keyword) {
|
|
|
$keyword && $query->where('u.nickname|u.mobile|u.id', 'like', $keyword);
|
|
$keyword && $query->where('u.nickname|u.mobile|u.id', 'like', $keyword);
|
|
|
}], $params)
|
|
}], $params)
|
|
|
- ->group('l.user_id')
|
|
|
|
|
|
|
+ ->group('u.id')
|
|
|
->field(['u.id', 'u.avatar', 'u.nickname', 'u.mobile', 'l.point', 'l.update_time'])
|
|
->field(['u.id', 'u.avatar', 'u.nickname', 'u.mobile', 'l.point', 'l.update_time'])
|
|
|
->paginate($pageAndLimit);
|
|
->paginate($pageAndLimit);
|
|
|
}
|
|
}
|