diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php index 52b70e819..26032ade2 100755 --- a/app/Http/Controllers/Api/DialogController.php +++ b/app/Http/Controllers/Api/DialogController.php @@ -256,8 +256,8 @@ class DialogController extends AbstractController // $dialog = WebSocketDialog::checkDialog($dialog_id); // - $data = $dialog->dialogUser->toArray(); if ($getuser === 1) { + $data = $dialog->dialogUser->toArray(); $array = []; foreach ($data as $item) { $res = User::userid2basic($item['userid']); @@ -265,14 +265,16 @@ class DialogController extends AbstractController $array[] = array_merge($item, $res->toArray()); } } - $data = $array; - } - // - $array = []; - foreach ($data as $item) { - if ($item['userid'] > 0) { - $array[] = $item; - } + $array = array_filter($array, function ($item) { + return $item['userid'] > 0; + }); + } else { + $data = WebSocketDialogUser::select(['web_socket_dialog_users.*', 'users.bot']) + ->join('users', 'web_socket_dialog_users.userid', '=', 'users.userid') + ->where('web_socket_dialog_users.dialog_id', $dialog_id) + ->orderBy('web_socket_dialog_users.id') + ->get(); + $array = $data->toArray(); } return Base::retSuccess('success', $array); } diff --git a/resources/assets/js/pages/manage/components/MeetingManager.vue b/resources/assets/js/pages/manage/components/MeetingManager.vue index c2e4baba6..78ece943d 100644 --- a/resources/assets/js/pages/manage/components/MeetingManager.vue +++ b/resources/assets/js/pages/manage/components/MeetingManager.vue @@ -246,7 +246,7 @@ export default { dialog_id: data.dialog_id } }).then(({data}) => { - this.$set(this.addData, 'userids', data.map(item => item.userid)) + this.$set(this.addData, 'userids', data.filter(item => !item.bot).map(item => item.userid)) }).finally(_ => { this.loadIng--; });