关系主页

application/api/controller/Relation.php

@@ -39,6 +39,7 @@ class Relation extends Api
         $userid = input('uid',0,'intval');
         $userid = $userid ? $userid : $this->auth->id;
 
+        //此用户创建
         $list = Db::name('user_relation')->alias('r')
             ->field('r.id,r.relationname,r.price,r.to_uid,user.u_id,user.nickname,user.avatar,user.id as user_id')
             ->join('user','r.to_uid = user.id','LEFT')
@@ -47,6 +48,17 @@ class Relation extends Api
             ->select();
         $list = list_domain_image($list,['avatar']);
 
+        //别人的关系，此用户加入
+        $list2 = Db::name('user_relation')->alias('r')
+            ->field('r.id,r.relationname,r.price,r.to_uid,user.u_id,user.nickname,user.avatar,user.id as user_id')
+            ->join('user','r.uid = user.id','LEFT')
+            ->where('r.to_uid',$userid)
+            ->order('id desc')
+            ->select();
+        $list = list_domain_image($list,['avatar']);
+
+        $list = array_merge($list,$list2);
+
         $this->success(1,$list);
     }