|
|
@@ -105,8 +105,8 @@ class WorkBooksService extends BaseService
|
|
|
$dataList = $this->model::from('work_books as b')
|
|
|
->leftJoin('works as a', 'a.id', '=', 'b.aid')
|
|
|
->leftJoin('member as m', 'm.id', '=', 'b.user_id')
|
|
|
- ->where(['a.mark'=> 1,'a.user_id'=> $userId])
|
|
|
- ->whereIn('a.status',[1,2,3])
|
|
|
+ ->where(['b.mark'=> 1,'b.user_id'=> $userId])
|
|
|
+ ->whereIn('b.status',[1,2,3])
|
|
|
->select(['b.id', 'b.aid', 'a.title', 'm.nickname', 'b.realname', 'b.phone', 'b.thumb', 'b.status','b.reason', 'b.create_time', 'b.update_time', 'b.description'])
|
|
|
->orderBy('b.update_time', 'desc')
|
|
|
->paginate($pageSize);
|
