加群处理

app/chat/controller/GroupController.php

@@ -554,17 +554,29 @@ class GroupController extends ApiController
             return $this->error('用户不在群内');
         }
         // 获取成员列表
-        $data['user_list'] = Db::name('chat_group_member')->where([
+        $user_list = Db::name('chat_group_member')->where([
             'group_id' => $groupId,
             'quit_time' => null,
             'is_kicked' => 0,
         ])
-        ->alias('member')
+        ->alias('member')->where('role', '<>', 1)
-        ->leftJoin('chat_user user', 'member.user_id = user.user_id')
+        ->leftJoin('tb_user_info user', 'member.user_id = user.id')
-        ->field('member.id as id, user.user_id as user_id, role, nick_name, avatar')
+        ->field('member.id as id, user.id as user_id, role, user.nick_name as nick_name, user.head_img as avatar')
-            ->order('member.id', 'asc')
+        ->order('member.id', 'asc')
-        ->select();
+        ->select()->toArray();
 
+        $user_list_member = Db::name('chat_group_member')->where([
+            'group_id' => $groupId,
+            'quit_time' => null,
+            'is_kicked' => 0,
+        ])
+        ->alias('member')->where('role', '=', 1)
+        ->leftJoin('tb_shop_info user', 'member.user_id = user.id')
+        ->field('member.id as id, user.id as user_id, role, user.shop_name as nick_name, user.logo as avatar')
+        ->order('member.id', 'asc')
+        ->select()->toArray();
+        array_unshift($user_list, $user_list_member[0]);
+        $data['user_list'] = $user_list;
         $data['grep_set'] = [
             'is_not_disturb' => $targetIsMember['is_dist'],
             'group_id' => $groupId