From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 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 e48221c..ef46d1b 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
@@ -116,7 +116,9 @@
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.household_id = #{householdId} AND jut.house_code = #{houseCode}
+ AND jts.parent_id = jt.id
+ <if test="householdId != null "> AND jut.household_id = #{householdId}</if>
+ AND jut.house_code = #{houseCode}
limit 1
) selected
FROM
--
Gitblit v1.9.3