diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index 7257a4ded..ca836142f 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -568,21 +568,34 @@ class DialogController extends AbstractController
         //
         $latest_id = intval(Request::input('latest_id'));
         //
+        \DB::statement("SET SQL_MODE=''");
         $builder = WebSocketDialogMsg::select([
             'web_socket_dialog_msgs.*',
             'read.mention',
             'read.read_at',
-        ])->join('web_socket_dialog_msg_reads as read', 'read.msg_id', '=', 'web_socket_dialog_msgs.id')
-            ->where('read.userid', $user->userid);
+        ])
+            ->join('web_socket_dialog_msg_reads as read', 'read.msg_id', '=', 'web_socket_dialog_msgs.id')
+            ->where('read.userid', $user->userid)
+            ->orWhere('web_socket_dialog_msgs.userid', $user->userid);
         //
         if ($latest_id > 0) {
             $builder->where('read.msg_id', '>', $latest_id);
         }
         //
-        $data = $builder->orderByDesc('read.msg_id')->paginate(Base::getPaginate(100, 50));
+        $data = $builder
+            ->groupBy('id')
+            ->orderByDesc('id')
+            ->paginate(Base::getPaginate(100, 50));
         if ($data->isEmpty()) {
             return Base::retError('empty');
         }
+        $data->transform(function (WebSocketDialogMsg $item) use ($user) {
+            if ($item->userid === $user->userid) {
+                $item->mention = 0;
+                $item->read_at = null;
+            }
+            return $item;
+        });
         return Base::retSuccess('success', $data);
     }
 
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index d678d38a7..3561fb6ea 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -757,6 +757,7 @@ export default {
             unreadMsgId: 0,                     // 最早未读消息id
             positionLoad: 0,                    // 定位跳转加载中
             positionShow: false,                // 定位跳转显示
+            renderMsgOffset: 0,                 // 渲染滚动距离
             renderMsgLength: 0,                 // 渲染消息长度
             msgPreparedStatus: false,           // 消息准备完成
             listPreparedStatus: false,          // 列表准备完成
@@ -1149,6 +1150,10 @@ export default {
                         dialog_id,
                         msg_id: this.msgId,
                         msg_type: this.msgType,
+                        save_before: _ => {
+                            const {tail} = this.scrollInfo();
+                            this.renderMsgOffset = tail > 55 ? (this.$refs.scroller.getScrollSize() - this.$refs.scroller.getOffset()) : 0
+                        }
                     }).then(_ => {
                         this.openId = dialog_id
                         this.listPreparedStatus = true
@@ -2229,7 +2234,12 @@ export default {
             if (this.renderMsgLength > 0 && this.$refs.scroller.getSizes() >= this.renderMsgLength) {
                 this.renderMsgLength = 0
                 this.onFooterResize()
-                this.onToBottom()
+                if (this.renderMsgOffset > 0) {
+                    this.onToOffset(this.$refs.scroller.getScrollSize() - this.renderMsgOffset)
+                    this.renderMsgOffset = 0
+                } else {
+                    this.onToBottom()
+                }
             }
         },