|
|
@@ -104,7 +104,7 @@ class ActivityBooksService extends BaseService
|
|
|
$dataList = $this->model::from('activity_books as b')
|
|
|
->leftJoin('activity as a', 'a.id', '=', 'b.aid')
|
|
|
->leftJoin('member as m', 'm.id', '=', 'b.user_id')
|
|
|
- ->where(['b.mark'=>1,'a.status'=> 1,'a.user_id'=> $userId])
|
|
|
+ ->where(['b.mark'=>1,'a.status'=> 1,'b.user_id'=> $userId,'a.mark'=> 1,'a.status'=> 1])
|
|
|
->select(['b.id', 'b.aid', 'a.title','a.thumb','b.coupon','a.publish_start','a.publish_end','a.price','b.gd_name','a.description', 'b.status', 'b.create_time', 'b.update_time'])
|
|
|
->orderBy('b.update_time', 'desc')
|
|
|
->paginate($pageSize);
|
