From fbfe73913079a2b66000998d8448da682f804f33 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Wed, 25 Jun 2025 17:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95=E6=96=AD?=
 =?UTF-8?q?=E5=B1=82=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/enterprise/controller/Im.php  | 2 +-
 app/enterprise/model/Message.php  | 3 ++-
 app/manage/controller/Message.php | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/enterprise/controller/Im.php b/app/enterprise/controller/Im.php
index 59ceac3..8014541 100644
--- a/app/enterprise/controller/Im.php
+++ b/app/enterprise/controller/Im.php
@@ -231,7 +231,7 @@ class Im extends BaseController
         if($last_id){
             $where[]=['msg_id','<',$last_id];
         }
-        $list = Message::getList($map, $where, 'msg_id desc', $listRows, $pageSize);
+        $list = Message::getList($map, $where, 'msg_id desc', $listRows, $pageSize, $this->uid);
         $data = $this->recombileMsg($list);
         // 如果是群聊并且是第一页消息，需要推送@数据给用户
         if($param['is_group']==1 && $param['page']==1){
diff --git a/app/enterprise/model/Message.php b/app/enterprise/model/Message.php
index 41cf001..47da50e 100644
--- a/app/enterprise/model/Message.php
+++ b/app/enterprise/model/Message.php
@@ -32,10 +32,11 @@ class Message extends BaseModel
     }
 
     // 查询聊天记录
-    public static function getList($map,$where,$sort,$listRows,$pageSize){
+    public static function getList($map,$where,$sort,$listRows,$pageSize,$user_id){
         $list= (new self())
         ->where($map)
         ->where($where)
+        ->where(" (find_in_set({$user_id},`del_user`) = 0 or del_user is null)")
         ->order($sort)
         ->paginate(['list_rows'=>$listRows,'page'=>$pageSize]);
         return $list;
diff --git a/app/manage/controller/Message.php b/app/manage/controller/Message.php
index 178c18c..3617510 100644
--- a/app/manage/controller/Message.php
+++ b/app/manage/controller/Message.php
@@ -50,7 +50,7 @@ class Message extends BaseController
         if($last_id){
             $where[]=['msg_id','<',$last_id];
         }
-        $list = MessageModel::getList($map, $where, 'msg_id desc', $listRows, $pageSize);
+        $list = MessageModel::getList($map, $where, 'msg_id desc', $listRows, $pageSize, $this->uid);
         $data = $this->recombileMsg($list);
         return success('', $data, $list->total(),$list->currentPage());
     }