diff --git a/Server/application/api/controller/MessageController.php b/Server/application/api/controller/MessageController.php
index 87575f31..daedae1a 100644
--- a/Server/application/api/controller/MessageController.php
+++ b/Server/application/api/controller/MessageController.php
@@ -397,9 +397,9 @@ class MessageController extends BaseController
                 if (!empty($accountData)){
                     $account = new AccountController();
                     $account->getlist(['pageIndex' => 0,'pageSize' => 100,'departmentId' => $accountData['departmentId']]);
-                    $accountIds = Db::table('s2_company_account')->where(['id' => $accountId,'alive' => 1])->column('id');
+                    $accountIds = Db::table('s2_company_account')->where(['departmentId' => $accountData['departmentId'],'alive' => 1])->column('id');
                     if (!empty($accountIds)){
-                        if (!in_array($friend['accountId'],$accountData)){
+                        if (!in_array($friend['accountId'],$accountIds)){
                             // 执行切换好友命令
                             $randomKey = array_rand($accountIds, 1);
                             $toAccountId = $accountIds[$randomKey];