From 098269adf61e31f366eafcea28d98853ac6ed4ff Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Tue, 6 Jun 2023 11:26:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20dootask=E5=AF=B9=E6=8E=A5=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=88=86=E4=BA=AB=20-=20=E6=B7=BB=E5=8A=A0=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/SystemController.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index 35d81676d..d7141b49e 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -1242,7 +1242,12 @@ class SystemController extends AbstractController
             ->orderByDesc('web_socket_dialogs.last_at')
             ->get()
             ->transform(function (WebSocketDialog $item) use ($user) {
-                return $item->formatData($user->userid);
+                $item = $item->formatData($user->userid);
+                $item->last_msg = [];
+                if(!$item->avatar){
+                    $item->avatar = 'avatar/'.$item->name.'.png';
+                }
+                return $item;
             })
             ->toArray();
         // 用户列表
@@ -1255,7 +1260,14 @@ class SystemController extends AbstractController
         $userList = User::select('userid','email','nickname','userimg')
             ->where('bot',0)
             ->where('userid','not in',$notUserIds)
-            ->get();
+            ->get()
+            ->transform(function (User $item) {
+                if(!$item->avatar){
+                    $item->avatar = 'avatar/'.($item->nickname ?: $item->email).'.png';
+                }
+                return $item;
+            })
+            ->toArray();
         // 返回
         return Base::retSuccess('success', ["dir"=>$dir,"chatList"=>$chatList,"userList"=>$userList]);
     }