黄宗昌 2 lat temu
rodzic
commit
07ae4c00ba

+ 7 - 1
app/Http/Controllers/V1/ProductController.php

xqd
@@ -375,12 +375,18 @@ class ProductController extends Controller
     public function collectList(Request $request){
         $limit = $request->get('limit',10);
         $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()
             ->with('product:id,name,image,url')
             ->whereHas('product',function ($query){
                 $query->where('id','>',0);
             })
-            ->where('user_id',$this->userId)
+            ->where('user_id',$user_id)
             ->where('is_arrange','=',0)
             ->select("id","product_id")
             ->paginate($limit);

+ 1 - 1
app/Http/Controllers/V1/UserController.php

xqd
@@ -70,7 +70,7 @@ class UserController extends Controller
            }
         }
         $info->follow_count = UserFollow::query()->where('user_id',$id)->count();
-        $info->is_follow = UserFollow::query()->where('user_id',$this->userId)->where('user_id',$id)->count();
+        $info->is_follow = UserFollow::query()->where('user_id',$this->userId)->where('to_user_id',$id)->count();
         return $this->success($info);
     }
     /**