From c02703a1aef70d2bb830c63652df72c98403db39 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 10:58:19 +0800
Subject: [PATCH] 小区用户支持栋,单元+名字查询

---
 src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml |   21 +++++++++++++++++++--
 1 files changed, 19 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 ac5f0e5..03a632b 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
@@ -11,12 +11,17 @@
         <result property="optionContent"    column="option_content"    />
         <result property="optionDetail"    column="option_detail"    />
         <result property="number"    column="number"    />
-        <result property="createTime"    column="crete_time"    />
+        <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="deleteFlag"    column="delete_flag"    />
         <result property="publicDiscussId"    column="public_discuss_id"    />
         <result property="parentId"    column="parent_id"    />
         <result property="level"    column="level"    />
+        <result property="selected"    column="selected"    />
+        <result property="articleId"    column="article_id"    />
+        <result property="optionNumber"    column="option_number"    />
+        <result property="mandatoryFlag"    column="mandatory_flag"    />
+        <result property="attachment"    column="attachment"    />
     </resultMap>
 
 
@@ -35,6 +40,10 @@
         <result property="parentId"    column="parent_id"    />
         <result property="level"    column="level"    />
         <result property="selected"    column="selected"    />
+        <result property="articleId"    column="article_id"    />
+        <result property="optionNumber"    column="option_number"    />
+        <result property="mandatoryFlag"    column="mandatory_flag"    />
+        <result property="attachment"    column="attachment"    />
         <collection property="children" column="id" javaType="list" ofType="org.springblade.modules.discuss.dto.TopicsDTO"  select="selectStlCount">
         </collection>
 
@@ -45,6 +54,7 @@
         <include refid="selectTopics"/>
         <where>
             <if test="id != null "> parent_id = #{id}</if>
+             and delete_flag = 0
         </where>
     </select>
 
@@ -64,7 +74,11 @@
             public_discuss_id,
             parent_id,
             level,
-            selected
+            selected,
+            article_id,
+            option_number,
+            mandatory_flag,
+            attachment
         from
             jczz_topics
     </sql>
@@ -88,6 +102,9 @@
         jt.parent_id,
         jt.article_id,
         jt.LEVEL,
+        jt.option_number,
+        jt.mandatory_flag,
+        jt.attachment,
         ( SELECT jut.selected FROM jczz_user_topics jut WHERE jut.article_id = jt.article_id AND jut.user_id = #{userId}
         limit 1
         ) selected

--
Gitblit v1.9.3