From 95ec53381beba7b2ccd67b6884f9f88fc9a65059 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Fri, 9 Jun 2023 15:27:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E4=BA=AB=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/UsersController.php | 12 ++++++++----
 app/Models/WebSocketDialog.php               |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 15f3404a7..f565965a1 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -1819,7 +1819,8 @@ class UsersController extends AbstractController
         $pid = intval( Request::input('pid',-1) );
         $uploadFileId = intval(Request::input('upload_file_id',-1));
         // 上传文件
-        if($uploadFileId !== -1){
+        if($uploadFileId !== -1 ){
+            if($pid==-1) $pid = 0;
             $webkitRelativePath = Request::input('webkitRelativePath');
             $data = (new File)->contentUpload($user,$pid,$webkitRelativePath);
             return Base::retSuccess('success', $data);
@@ -1845,21 +1846,24 @@ class UsersController extends AbstractController
                 'type'   => 'children',
                 'url'    => Base::fillUrl("api/users/share/list")."?pid=0", 
                 'icon'   => url("/images/file/light/folder.svg"),
-                'extend' => ['file'=>true],
+                'extend' => ['upload_file_id'=>0],
                 'name'   => '全部文件',
             ]];
             $dialogList = (new WebSocketDialog)->getDialogList($user->userid);
             foreach($dialogList['data'] as $dialog){
                 if($dialog['type'] == 'user'){
-                    $avatar = User::getAvatar($dialog['dialog_user']['userid'], $dialog['avatar'], $dialog['email'], $dialog['name']);
+                    $avatar = User::getAvatar($dialog['dialog_user']['userid'], $dialog['userimg'], $dialog['email'], $dialog['name']);
                 }else{
                     switch ( $dialog['group_type'] ) {
                         case 'department':
                             $avatar = url("images/avatar/default_department.png");
+                            break;
                         case 'project':
                             $avatar = url("images/avatar/default_project.png");
+                            break;
                         case 'task':
                             $avatar = url("images/avatar/default_task.png");
+                            break;
                         default:
                             $avatar = url("images/avatar/default_people.png");
                             break;
@@ -1870,7 +1874,7 @@ class UsersController extends AbstractController
                     'name'   => $dialog['name'],
                     'icon'   => $avatar,
                     'url'    => Base::fillUrl("api/dialog/msg/sendfiles"), 
-                    'extend' => [ 'dialog_ids' => $dialog['id'] ]
+                    'extend' => ['dialog_ids' => $dialog['id']]
                 ];
             }
         }
diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php
index a75a5f3a1..84c4bb7cf 100644
--- a/app/Models/WebSocketDialog.php
+++ b/app/Models/WebSocketDialog.php
@@ -68,7 +68,7 @@ class WebSocketDialog extends AbstractModel
 
 
     /**
-     * 格式化对话
+     * 获取对话列表
      * @param int $userid   会员ID
      * @param bool $hasData
      * @return $this
@@ -150,9 +150,9 @@ class WebSocketDialog extends AbstractModel
                 }
                 $basic = User::userid2basic($dialog_user->userid);
                 if ($basic) {
-                    $this->avatar = $basic->userimg;
                     $this->name = $basic->nickname;
                     $this->email = $basic->email;
+                    $this->userimg = $basic->userimg;
                     $this->bot = $basic->getBotOwner();
                     $this->quick_msgs = UserBot::quickMsgs($basic->email);
                 } else {