wesmiler

app/Services/Api/MemberCollectService.php

@@ -73,30 +73,31 @@ class MemberCollectService extends BaseService
             ->where($where)
             ->where(function ($query) use ($params, $userId) {
                 $followType = isset($params['follow_type'])? $params['follow_type'] : 0;
+                $uid = isset($params['uid']) && $params['uid']? $params['uid'] : $userId;
                 if (in_array($followType,[1,2,3])) {
                     // 互关的人
                     if($followType == 1){
-                        $uids = $this->getCollectUsers(['user_id'=> $userId,'is_return'=>1,'status'=>1,'mark'=>1],'collect_uid');
+                        $uids = $this->getCollectUsers(['user_id'=> $uid,'is_return'=>1,'status'=>1,'mark'=>1],'collect_uid');
                         $uids = $uids? $uids : [0];
                         $query->whereIn('a.id', $uids);
                     }
                     // 关注我的人
                     else if($followType == 2){
-                        $uids = $this->getCollectUsers(['collect_uid'=> $userId,'status'=>1,'mark'=>1],'user_id');
+                        $uids = $this->getCollectUsers(['collect_uid'=> $uid,'status'=>1,'mark'=>1],'user_id');
                         $uids = $uids? $uids : [0];
                         $query->whereIn('a.id', $uids);
                     }
                     // 我关注的人
                     else if($followType == 3){
-                        $uids = $this->getCollectUsers(['user_id'=> $userId,'status'=>1,'mark'=>1],'collect_uid');
+                        $uids = $this->getCollectUsers(['user_id'=> $uid,'status'=>1,'mark'=>1],'collect_uid');
                         $uids = $uids? $uids : [0];
                         $query->whereIn('a.id', $uids);
                     }
                 }else if($followType>=0){
                     // 我关注的和关注我的人
-                    $uids = $this->getCollectUsers(['user_id'=> $userId,'is_return'=>1,'status'=>1,'mark'=>1],'collect_uid');
+                    $uids = $this->getCollectUsers(['user_id'=> $uid,'is_return'=>1,'status'=>1,'mark'=>1],'collect_uid');
                     $uids = $uids? $uids : [0];
-                    $uids1 = $this->getCollectUsers(['collect_uid'=> $userId,'status'=>1,'mark'=>1],'user_id');
+                    $uids1 = $this->getCollectUsers(['collect_uid'=> $uid,'status'=>1,'mark'=>1],'user_id');
                     $uids1 = $uids1? $uids1 : [0];
                     $query->whereIn('a.id', $uids)->orWhereIn('a.id', $uids1);
                 }