From a969a4cdf9d9829762c8db4aa0362dc272ca3e12 Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Tue, 9 Dec 2025 08:25:01 +0800
Subject: [PATCH] =?UTF-8?q?test(addon/aikefu):=20=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E7=AE=A1=E7=90=86=E5=8F=8A=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/addon/aikefu/shop/controller/Kefu.php    |  6 ++++++
 src/addon/aikefu/shop/view/kefu/message.html | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/addon/aikefu/shop/controller/Kefu.php b/src/addon/aikefu/shop/controller/Kefu.php
index aa5f2847e..79107abe0 100644
--- a/src/addon/aikefu/shop/controller/Kefu.php
+++ b/src/addon/aikefu/shop/controller/Kefu.php
@@ -236,6 +236,7 @@ class Kefu extends BaseShop
         $page = input("page/d", 1);
         $limit = input("limit/d", 50);
         $conversation_id = input("conversation_id/s", "");
+        $user_id = input("user_id/s", "");
 
         $kefu_message_model = new KefuMessageModel();
         $condition = [
@@ -246,6 +247,11 @@ class Kefu extends BaseShop
         if (!empty($conversation_id)) {
             $condition[] = ['conversation_id', '=', $conversation_id];
         }
+        
+        // 只有当用户ID不为空时才添加用户ID条件
+        if (!empty($user_id)) {
+            $condition[] = ['user_id', '=', $user_id];
+        }
 
         $message_list = $kefu_message_model->getMessageList($condition, '*', 'create_time asc', $page, $limit);
         // 适配layui table的返回格式，同时保持与Dify API风格一致
diff --git a/src/addon/aikefu/shop/view/kefu/message.html b/src/addon/aikefu/shop/view/kefu/message.html
index 2771547d3..b9154fb99 100644
--- a/src/addon/aikefu/shop/view/kefu/message.html
+++ b/src/addon/aikefu/shop/view/kefu/message.html
@@ -216,6 +216,10 @@
                 <label for="conversation_id">会话ID</label>
                 <input type="text" name="conversation_id" id="conversation_id" placeholder="请输入会话ID进行过滤" value="{$conversation_id ?? ''}" class="layui-input" style="width: 250px; display: inline-block;">
             </div>
+            <div class="search-item">
+                <label for="user_id">用户ID</label>
+                <input type="text" name="user_id" id="user_id" placeholder="请输入用户ID进行过滤" value="{$user_id ?? ''}" class="layui-input" style="width: 200px; display: inline-block;">
+            </div>
             <div class="search-item">
                 <button type="button" class="layui-btn layui-btn-primary" id="searchBtn">搜索</button>
                 <button type="button" class="layui-btn" id="resetBtn">重置</button>
@@ -248,6 +252,7 @@
         var limit = 50;
         var total = 0;
         var conversation_id = $('#conversation_id').val();
+        var user_id = $('#user_id').val();
         
         // 加载会话信息（当指定会话ID时显示）
         function loadConversationInfo() {
@@ -297,6 +302,11 @@
                 requestData.conversation_id = conversation_id;
             }
             
+            // 如果有用户ID，则添加到请求数据中
+            if (user_id) {
+                requestData.user_id = user_id;
+            }
+            
             $.ajax({
                 url: ns.url("aikefu://shop/kefu/getMessageList"),
                 type: 'POST',
@@ -375,6 +385,7 @@
         // 搜索按钮点击事件
         $('#searchBtn').click(function() {
             conversation_id = $('#conversation_id').val().trim();
+            user_id = $('#user_id').val().trim();
             page = 1;
             loadConversationInfo();
             loadMessageList();
@@ -383,7 +394,9 @@
         // 重置按钮点击事件
         $('#resetBtn').click(function() {
             $('#conversation_id').val('');
+            $('#user_id').val('');
             conversation_id = '';
+            user_id = '';
             page = 1;
             loadConversationInfo();
             loadMessageList();