From 7dbc224fddba144063f52cab6ee911b7c63184ca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 12 Jan 2024 16:24:02 +0800
Subject: [PATCH] 议事查询参与用户优化

---
 src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
index 720f97d..a4dc151 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -32,7 +32,10 @@
     <select id="selectUserTopicsPage" resultMap="userTopicsResultMap">
         SELECT
         jut.article_id,
+        jut.id,
+        jut.delete_flag,
         jut.signature_path,
+        jut.create_time,
         bu.avatar,
         bu.`name`,
         bu.phone,
@@ -45,13 +48,20 @@
         LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
         <where>
             <if test="userTopics.id != null ">and jut.id = #{userTopics.id}</if>
+            <if test="userTopics.name != null and userTopics.name != ''">
+                and bu.name like concat('%',#{userTopics.name},'%')
+            </if>
+            <if test="userTopics.phone != null and userTopics.phone != ''">
+                and bu.phone like concat('%',#{userTopics.phone},'%')
+            </if>
             <if test="userTopics.userId != null ">and jut.user_id = #{userTopics.userId}</if>
             <if test="userTopics.topicsId != null ">and jut.topics_id = #{userTopics.topicsId}</if>
             <if test="userTopics.createTime != null ">and jut.create_time = #{userTopics.createTime}</if>
             <if test="userTopics.updateTime != null ">and jut.update_time = #{userTopics.updateTime}</if>
             <if test="userTopics.deleteFlag != null ">and jut.delete_flag = #{userTopics.deleteFlag}</if>
             <if test="userTopics.articleId != null ">and jut.article_id = #{userTopics.articleId}
-                GROUP BY jut.article_id, jut.signature_path,
+                and jut.delete_flag = 0
+                GROUP BY jut.article_id, jut.signature_path,jut.create_time,jut.id,jut.delete_flag,
                 bu.avatar,
                 bu.`name`,
                 bu.phone,

--
Gitblit v1.9.3