From 4ed276903d7e7fe2ac1244eceb37ff8a3f8b50d1 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Thu, 14 Aug 2025 14:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E4=BC=98=E5=8C=963?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/task/UserClearMessage.php | 5 ++---
 app/enterprise/model/Message.php     | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/common/task/UserClearMessage.php b/app/common/task/UserClearMessage.php
index aa97616..f4224d2 100644
--- a/app/common/task/UserClearMessage.php
+++ b/app/common/task/UserClearMessage.php
@@ -72,8 +72,7 @@ class UserClearMessage extends Task
 
                     $whereMsg = [
                         ['create_time', '<', $time],
-                        ['from_user', '=', $form_user],
-                        ['to_user', '=', $to_user],
+                        ['is_group', '=', 0],
                         ['chat_identify', '=', $chat_identify]
                     ];
                     $msgRes = Message::where($whereMsg)->select();
@@ -101,7 +100,7 @@ class UserClearMessage extends Task
 
                     $whereMsg = [
                         ['create_time', '<', $time],
-                        ['from_user', '=', $form_user],
+                        ['is_group', '=', 1],
                         ['to_user', '=', $group_id],
                         ['chat_identify', '=', $chat_identify]
                     ];
diff --git a/app/enterprise/model/Message.php b/app/enterprise/model/Message.php
index 8d47a42..7b6961e 100644
--- a/app/enterprise/model/Message.php
+++ b/app/enterprise/model/Message.php
@@ -384,7 +384,7 @@ class Message extends BaseModel
         } else {
             $msgInfo['content'] = lang('im.you'). $data['content'];
         }
-        $msgInfo['formUser'] = $fromUser;
+        $msgInfo['fromUser'] = $fromUser;
         $msgInfo['download'] = '';
         $msgInfo['extUrl'] = '';
         $msgInfo['extends'] = null;
@@ -394,7 +394,7 @@ class Message extends BaseModel
         $msgInfo['file_id'] = 0;
         $msgInfo['from_user'] = $from_user;
         $msgInfo['preview'] = "";
-        $msgInfo['toContactId'] = $to_user;
+        $msgInfo['toContactId'] = (int)$from_user;
         return $msgInfo;
     }
 }
\ No newline at end of file