From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 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 c7b0108..a1510be 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -30,8 +30,11 @@
<select id="selectUserTopicsPage" resultMap="userTopicsResultMap">
- SELECT
- jut.public_discuss_id,
+ SELECT distinct
+ jut.article_id,
+ jut.delete_flag,
+ jut.signature_path,
+ jut.create_time,
bu.avatar,
bu.`name`,
bu.phone,
@@ -39,18 +42,25 @@
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>
+ <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.publicDiscussId != null ">and jut.public_discuss_id = #{userTopics.publicDiscussId}
- GROUP BY jut.public_discuss_id,
+ <if test="userTopics.articleId != null ">and jut.article_id = #{userTopics.articleId}
+ and jut.delete_flag = 0
+ GROUP BY jut.article_id, jut.signature_path,jut.create_time,jut.delete_flag,
bu.avatar,
bu.`name`,
bu.phone,
@@ -60,16 +70,17 @@
</where>
</select>
- <select id="selectUserTopicsList" parameterType="org.springblade.modules.discuss.dto.UserTopicsDTO" resultMap="userTopicsResultMap">
+ <select id="selectUserTopicsList" parameterType="org.springblade.modules.discuss.dto.UserTopicsDTO"
+ resultMap="userTopicsResultMap">
<include refid="selectUserTopics"/>
<where>
- <if test="id != null "> and id = #{id}</if>
- <if test="userId != null "> and user_id = #{userId}</if>
- <if test="topicsId != null "> and topics_id = #{topicsId}</if>
- <if test="createTime != null "> and create_time = #{createTime}</if>
- <if test="updateTime != null "> and update_time = #{updateTime}</if>
- <if test="deleteFlag != null "> and delete_flag = #{deleteFlag}</if>
- <if test="publicDiscussId != null "> and public_discuss_id = #{publicDiscussId}</if>
+ <if test="id != null ">and id = #{id}</if>
+ <if test="userId != null ">and user_id = #{userId}</if>
+ <if test="topicsId != null ">and topics_id = #{topicsId}</if>
+ <if test="createTime != null ">and create_time = #{createTime}</if>
+ <if test="updateTime != null ">and update_time = #{updateTime}</if>
+ <if test="deleteFlag != null ">and delete_flag = #{deleteFlag}</if>
+ <if test="publicDiscussId != null ">and public_discuss_id = #{publicDiscussId}</if>
</where>
</select>
--
Gitblit v1.9.3