From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
index 25d3497..b09680d 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
@@ -88,8 +88,31 @@
<select id="selectTopicsList" parameterType="org.springblade.modules.discuss.dto.TopicsDTO" resultMap="TopicsDTOResult">
SELECT
- jt.*,
- ( SELECT jut.selected FROM jczz_user_topics jut WHERE jut.article_id = jt.article_id AND jut.user_id = #{userId}
+ jt.id,
+ jt.discuss_content,
+ jt.option_range,
+ jt.sort,
+ jt.option_content,
+ jt.option_detail,
+ jt.number,
+ jt.create_time,
+ jt.update_time,
+ jt.delete_flag,
+ jt.public_discuss_id,
+ jt.parent_id,
+ jt.article_id,
+ jt.LEVEL,
+ jt.option_number,
+ jt.mandatory_flag,
+ jt.attachment,
+ ( SELECT
+ jut.selected
+ FROM
+ jczz_user_topics jut
+ LEFT JOIN jczz_topics jts ON jts.id = jut.topics_id
+ WHERE
+ jut.article_id = jt.article_id
+ AND jts.parent_id = jt.id AND jut.user_id = #{userId}
limit 1
) selected
FROM
--
Gitblit v1.9.3