diff --git a/app/Models/User.php b/app/Models/User.php index a8b9b9b23..04b4a5499 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -222,10 +222,14 @@ class User extends AbstractModel /** * 返回是否禁用帐号(离职) + * @param bool $incAt 是否包含禁用时间 * @return bool */ - public function isDisable() + public function isDisable($incAt = false) { + if ($incAt) { + return in_array('disable', $this->identity) || $this->disable_at; + } return in_array('disable', $this->identity); } diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index b930e8251..b7fca77d0 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -291,6 +291,7 @@ class WebSocketDialog extends AbstractModel $data['email'] = $basic->email; $data['userimg'] = $basic->userimg; $data['bot'] = $basic->getBotOwner(); + $data['is_disable'] = $basic->isDisable(true); $data['quick_msgs'] = UserBot::quickMsgs($basic->email); } else { $data['name'] = 'non-existent'; diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index ec89e4031..435347aae 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -260,6 +260,9 @@