From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 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 a9a4940..4346502 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
@@ -45,6 +45,7 @@
<include refid="selectTopics"/>
<where>
<if test="id != null "> parent_id = #{id}</if>
+ and delete_flag = 0
</where>
</select>
@@ -89,6 +90,7 @@
jt.article_id,
jt.LEVEL,
( SELECT jut.selected FROM jczz_user_topics jut WHERE jut.article_id = jt.article_id AND jut.user_id = #{userId}
+ limit 1
) selected
FROM
jczz_topics jt
--
Gitblit v1.9.3