mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-12 19:35:50 +00:00
perf: 创建会议不需要加入机器人
This commit is contained in:
parent
e2768f7f20
commit
b7dcb543f6
@ -256,8 +256,8 @@ class DialogController extends AbstractController
|
|||||||
//
|
//
|
||||||
$dialog = WebSocketDialog::checkDialog($dialog_id);
|
$dialog = WebSocketDialog::checkDialog($dialog_id);
|
||||||
//
|
//
|
||||||
$data = $dialog->dialogUser->toArray();
|
|
||||||
if ($getuser === 1) {
|
if ($getuser === 1) {
|
||||||
|
$data = $dialog->dialogUser->toArray();
|
||||||
$array = [];
|
$array = [];
|
||||||
foreach ($data as $item) {
|
foreach ($data as $item) {
|
||||||
$res = User::userid2basic($item['userid']);
|
$res = User::userid2basic($item['userid']);
|
||||||
@ -265,14 +265,16 @@ class DialogController extends AbstractController
|
|||||||
$array[] = array_merge($item, $res->toArray());
|
$array[] = array_merge($item, $res->toArray());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$data = $array;
|
$array = array_filter($array, function ($item) {
|
||||||
}
|
return $item['userid'] > 0;
|
||||||
//
|
});
|
||||||
$array = [];
|
} else {
|
||||||
foreach ($data as $item) {
|
$data = WebSocketDialogUser::select(['web_socket_dialog_users.*', 'users.bot'])
|
||||||
if ($item['userid'] > 0) {
|
->join('users', 'web_socket_dialog_users.userid', '=', 'users.userid')
|
||||||
$array[] = $item;
|
->where('web_socket_dialog_users.dialog_id', $dialog_id)
|
||||||
}
|
->orderBy('web_socket_dialog_users.id')
|
||||||
|
->get();
|
||||||
|
$array = $data->toArray();
|
||||||
}
|
}
|
||||||
return Base::retSuccess('success', $array);
|
return Base::retSuccess('success', $array);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -246,7 +246,7 @@ export default {
|
|||||||
dialog_id: data.dialog_id
|
dialog_id: data.dialog_id
|
||||||
}
|
}
|
||||||
}).then(({data}) => {
|
}).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(_ => {
|
}).finally(_ => {
|
||||||
this.loadIng--;
|
this.loadIng--;
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user