From 4dee17983a109b3f72f49ce54dc7ad30610158b4 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 7 Feb 2023 13:11:21 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/WebSocketDialog.php                              | 6 ++++--
 .../assets/js/pages/manage/components/DialogWrapper.vue     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php
index 164d9cfdb..6d87ea97f 100644
--- a/app/Models/WebSocketDialog.php
+++ b/app/Models/WebSocketDialog.php
@@ -79,12 +79,14 @@ class WebSocketDialog extends AbstractModel
             $unreadBuilder = WebSocketDialogMsgRead::whereDialogId($this->id)->whereUserid($userid)->whereReadAt(null);
             $this->unread = $unreadBuilder->count();
             $this->mention = 0;
-            $this->first_umid = 0;  // 第一条未读消息
             $this->last_umid = 0;
+            $this->first_umid = 0;  // 第一条未读消息
             if ($this->unread > 0) {
                 $this->mention = $unreadBuilder->clone()->whereMention(1)->count();
-                $this->first_umid = intval($unreadBuilder->clone()->orderBy('msg_id')->value('msg_id'));
                 $this->last_umid = intval($unreadBuilder->clone()->orderByDesc('msg_id')->value('msg_id'));
+                if ($hasData === true) {
+                    $this->first_umid = intval($unreadBuilder->clone()->orderBy('msg_id')->value('msg_id'));
+                }
             }
             $this->mark_unread = $this->mark_unread ?? $dialogUserFun('mark_unread');
             // 是否免打扰
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 09945f778..5a7b80fbd 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -1064,7 +1064,7 @@ export default {
 
         getMsgs(data) {
             return new Promise((resolve, reject) => {
-                setTimeout(_ => this.msgLoadIng++, 600)
+                setTimeout(_ => this.msgLoadIng++, 2000)
                 this.$store.dispatch("getDialogMsgs", data)
                     .then(resolve)
                     .catch(reject)