From 5de4a49148636dce6568d37e4c62039934b0a188 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 十月 2025 16:36:34 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TFeedbackMapper.xml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TFeedbackMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TFeedbackMapper.xml
index 1c9b2d1..061d16f 100644
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TFeedbackMapper.xml
+++ b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TFeedbackMapper.xml
@@ -16,9 +16,20 @@
         id, userId, img, content, state
     </sql>
     <select id="listAll" resultType="com.ruoyi.management.vo.FeedbackVO">
-        select t1.*,t1.createTime as insertTime
+        select t1.*,t2.name,t2.phone,t1.createTime as insertTime
         from t_feedback t1
+        left join dolphin_study.t_user t2 on t1.userId = t2.id
         where 1=1
+          and t1.disabled = 0
+          <if test="null != req.phone and req.phone !=''">
+            and t2.phone like concat('%',#{req.phone},'%')
+        </if>
+          <if test="null != req.userName and req.userName !=''">
+            and t2.name like concat('%',#{req.userName},'%')
+        </if>
+          <if test="null != req.startTime and req.startTime !=''">
+            and t1.createTime between #{req.startTime} and #{req.endTime}
+        </if>
 
         <if test="null != req.state">
             and t1.state = #{req.state}

--
Gitblit v1.7.1