From f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 16:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 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 105af85..720f97d 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -32,6 +32,7 @@
<select id="selectUserTopicsPage" resultMap="userTopicsResultMap">
SELECT
jut.article_id,
+ jut.signature_path,
bu.avatar,
bu.`name`,
bu.phone,
@@ -39,8 +40,8 @@
jda.aoi_name
FROM
jczz_user_topics as jut
- LEFT JOIN blade_user bu ON jut.user_id = bu.id
- LEFT JOIN jczz_household jh ON jh.associated_user_id = jut.user_id
+ LEFT JOIN blade_user bu ON jut.user_id = bu.id AND bu.is_deleted = 0
+ LEFT JOIN jczz_household jh ON jh.associated_user_id = jut.user_id AND jh.is_deleted = 0
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>
@@ -50,7 +51,7 @@
<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,
+ GROUP BY jut.article_id, jut.signature_path,
bu.avatar,
bu.`name`,
bu.phone,
--
Gitblit v1.9.3