wesmiler 报恩寺项目提交

app/Services/MemberService.php

@@ -732,21 +732,32 @@ class MemberService extends BaseService
         $params = request()->all();
         $page = isset($params['pageSize']) ? intval($params['pageSize']) : PAGE;
         $pageSize = isset($params['pageSize']) ? intval($params['pageSize']) : PERPAGE;
+        $type = isset($params['type'])? $params['type'] : 0;
+        $where = ['m.mark'=>1,'m.status'=> 1];
 
         $dataList = $this->model::from('member as m')
+            ->leftJoin('master as ms','ms.user_id','=','m.id')
             ->leftJoin('member_follow as mf','mf.follow_uid','=','m.id')
-            ->where(['m.mark'=>1,'m.status'=> 1])
+            ->where($where)
+            ->where(function($query) use($type){
+                if($type==1){
+                    $query->where('ms.type',1);
+                }else if($type == 2){
+                    $query->whereNotIn('ms.type',[1]);
+                }
+            })
             ->whereNotIn('m.id', [$userId])
             ->whereNotIn('m.id',function($query) use ($userId){
                 $query->from('member_follow')->where(['user_id'=> $userId])->select(['follow_uid']);
             })
-            ->select(['m.id', 'm.avatar','m.nickname','m.gender','m.status','m.create_time'])
+            ->select(['m.id', 'm.avatar','m.nickname','ms.realname as master_name','ms.type as master_type','m.gender','m.status','m.create_time'])
             ->orderBy('mf.create_time', 'asc')
             ->paginate($pageSize);
 
         $dataList = $dataList ? $dataList->toArray() : [];
         if ($dataList) {
             foreach ($dataList['data'] as &$item) {
+                $item['']
                 $item['avatar'] = $item['avatar']? get_image_url($item['avatar']) : '';
                 $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
             }