From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 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 1032dc9..c95330c 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="topicsResultMap" type="org.springblade.modules.discuss.entity.TopicsEntity">
<result property="id" column="id" />
<result property="discussContent" column="discuss_content" />
- <result property="option" column="option" />
+ <result property="optionRange" column="option_range" />
<result property="sort" column="sort" />
<result property="optionContent" column="option_content" />
<result property="optionDetail" column="option_detail" />
@@ -23,7 +23,7 @@
<resultMap type="org.springblade.modules.discuss.dto.TopicsDTO" id="TopicsDTOResult">
<result property="id" column="id" />
<result property="discussContent" column="discuss_content" />
- <result property="option" column="option" />
+ <result property="optionRange" column="option_range" />
<result property="sort" column="sort" />
<result property="optionContent" column="option_content" />
<result property="optionDetail" column="option_detail" />
@@ -34,16 +34,18 @@
<result property="publicDiscussId" column="public_discuss_id" />
<result property="parentId" column="parent_id" />
<result property="level" column="level" />
-
- <collection property="children" column="id" javaType="int" select="selectStlCount">
+ <result property="selected" column="selected" />
+ <collection property="children" column="id" javaType="list" ofType="org.springblade.modules.discuss.dto.TopicsDTO" select="selectStlCount">
</collection>
</resultMap>
- <select id="selectStlCount" resultMap="TopicsDTOResult">
+ <select id="selectStlCount" parameterType="int" resultType="org.springblade.modules.discuss.dto.TopicsDTO">
<include refid="selectTopics"/>
- where parent_id = #{id}
+ <where>
+ <if test="id != null "> parent_id = #{id}</if>
+ </where>
</select>
@@ -51,7 +53,7 @@
select
id,
discuss_content,
- option,
+ option_range,
sort,
option_content,
option_detail,
@@ -61,7 +63,8 @@
delete_flag,
public_discuss_id,
parent_id,
- level
+ level,
+ selected
from
jczz_topics
</sql>
@@ -70,19 +73,38 @@
</select>
<select id="selectTopicsList" parameterType="org.springblade.modules.discuss.dto.TopicsDTO" resultMap="TopicsDTOResult">
- <include refid="selectTopics"/>
+ SELECT
+ 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.LEVEL,
+ ( SELECT jut.selected FROM jczz_user_topics jut WHERE jut.topics_id = jt.id AND jut.user_id = #{userId} ) selected
+ FROM
+ jczz_topics jt
<where>
- <if test="id != null "> and id = #{id}</if>
- <if test="discussContent != null and discussContent != ''"> and discuss_content = #{discussContent}</if>
- <if test="option != null "> and option = #{option}</if>
- <if test="sort != null "> and sort = #{sort}</if>
- <if test="optionContent != null and optionContent != ''"> and option_content = #{optionContent}</if>
- <if test="optionDetail != null and optionDetail != ''"> and option_detail = #{optionDetail}</if>
- <if test="number != null "> and number = #{number}</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 jt.id = #{id}</if>
+ <if test="discussContent != null and discussContent != ''"> and jt.discuss_content = #{discussContent}</if>
+ <if test="optionRange != null "> and jt.option_range = #{optionRange}</if>
+ <if test="sort != null "> and jt.sort = #{sort}</if>
+ <if test="optionContent != null and optionContent != ''"> and jt.option_content = #{optionContent}</if>
+ <if test="optionDetail != null and optionDetail != ''"> and jt.option_detail = #{optionDetail}</if>
+ <if test="number != null "> and jt.number = #{number}</if>
+ <if test="createTime != null "> and jt.create_time = #{createTime}</if>
+ <if test="updateTime != null "> and jt.update_time = #{updateTime}</if>
+ <if test="deleteFlag != null "> and jt.delete_flag = #{deleteFlag}</if>
+ <if test="publicDiscussId != null "> and jt.public_discuss_id = #{publicDiscussId}</if>
+ <if test="parentId != null "> and jt.parent_id = #{parentId}</if>
+ <if test="level != null "> and jt.level = #{level}</if>
+ and jt.delete_flag = 0
</where>
</select>
--
Gitblit v1.9.3