From 9bb3b6ba314fe1c5881aa2dda522511992b3d8c4 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 18:10:04 +0800
Subject: [PATCH] 代码优化

---
 src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 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..3e83b8a 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,17 @@
         <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">
+        <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 +52,7 @@
         select
             id,
             discuss_content,
-        option,
+            option_range,
             sort,
             option_content,
             option_detail,
@@ -74,7 +75,7 @@
         <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="optionRange != null "> and option_range = #{optionRange}</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>
@@ -83,6 +84,9 @@
             <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="parentId != null "> and parent_id = #{parentId}</if>
+            <if test="level != null "> and level = #{level}</if>
+            and delete_flag = 0
         </where>
     </select>
 

--
Gitblit v1.9.3