From 319e03a0f2a19d387a20432f1d88565160fb2ace Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Fri, 27 Jun 2025 10:02:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=A5=BD=E5=8F=8B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=88=E4=BF=AE=E5=A4=8D=E5=8F=AF=E4=BB=A5=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=88=B0=E5=85=B6=E4=BB=96=E5=BE=AE=E4=BF=A1=E5=A5=BD?=
 =?UTF-8?q?=E5=8F=8B=E7=9A=84BUG=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cunkebao/controller/friend/GetFriendListV1Controller.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php b/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php
index 6f3f3a00..bf5881b1 100644
--- a/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php
+++ b/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php
@@ -56,7 +56,8 @@ class GetFriendListV1Controller extends BaseController
                 ->field(['wa1.nickname','wa1.avatar','wa1.alias','wf.id','wf.wechatId','wa2.nickname as ownerNickname','wa2.alias as ownerAlias','wa2.wechatId as ownerWechatId','wf.createTime'])
                 ->Join('wechat_account wa1','wf.wechatId = wa1.wechatId')
                 ->Join('wechat_account wa2','wf.ownerWechatId = wa2.wechatId')
-                ->join('device_wechat_login dw','wa2.wechatId = dw.wechatId AND alive = 1')
+                ->join('device_wechat_login dw','wa2.wechatId = dw.wechatId AND alive = 1 AND dw.companyId = '.$this->getUserInfo('companyId'))
+                ->join('device d','dw.deviceId = d.id AND d.deleteTime = 0 AND d.companyId = '.$this->getUserInfo('companyId'))
                 ->where($where);
 
             $total = $data->count();
@@ -71,6 +72,7 @@ class GetFriendListV1Controller extends BaseController
                 'data' => [
                     'list' => $list,
                     'total' => $total,
+                    'companyId' => $this->getUserInfo('companyId')
                 ]
             ]);
         } catch (\Exception $e) {