|
@@ -375,12 +375,18 @@ class ProductController extends Controller
|
|
public function collectList(Request $request){
|
|
public function collectList(Request $request){
|
|
$limit = $request->get('limit',10);
|
|
$limit = $request->get('limit',10);
|
|
$go = $request->get('go',6);
|
|
$go = $request->get('go',6);
|
|
|
|
+ $user_id = $request->get('user_id');
|
|
|
|
+ if(!empty($user_id)){
|
|
|
|
+ $user_id = $user_id;
|
|
|
|
+ }else{
|
|
|
|
+ $user_id = $this->userId;
|
|
|
|
+ }
|
|
$list = UserCollect::query()
|
|
$list = UserCollect::query()
|
|
->with('product:id,name,image,url')
|
|
->with('product:id,name,image,url')
|
|
->whereHas('product',function ($query){
|
|
->whereHas('product',function ($query){
|
|
$query->where('id','>',0);
|
|
$query->where('id','>',0);
|
|
})
|
|
})
|
|
- ->where('user_id',$this->userId)
|
|
|
|
|
|
+ ->where('user_id',$user_id)
|
|
->where('is_arrange','=',0)
|
|
->where('is_arrange','=',0)
|
|
->select("id","product_id")
|
|
->select("id","product_id")
|
|
->paginate($limit);
|
|
->paginate($limit);
|