From 3a13b8bf30fbbe0bb34bccf94fd60c8616892799 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Tue, 6 Jun 2023 14:25:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/SystemController.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index d7141b49e..95521e0ad 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -1251,7 +1251,7 @@ class SystemController extends AbstractController
             })
             ->toArray();
         // 用户列表
-        $notUserIds = array();    
+        $notUserIds = [$user->userid];    
         foreach($chatList as $chat){
             if($chat['type'] == 'user'){
                 $notUserIds[] = $chat['dialog_user']['userid'];
@@ -1259,12 +1259,13 @@ class SystemController extends AbstractController
         }    
         $userList = User::select('userid','email','nickname','userimg')
             ->where('bot',0)
-            ->where('userid','not in',$notUserIds)
+            ->where('changepass',0)
+            ->whereNull('disable_at')
+            ->whereNotIn('userid',$notUserIds)
             ->get()
             ->transform(function (User $item) {
-                if(!$item->avatar){
-                    $item->avatar = 'avatar/'.($item->nickname ?: $item->email).'.png';
-                }
+                $item->name = $item->nickname;
+                $item->avatar = $item->userimg;
                 return $item;
             })
             ->toArray();