From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
index 7c5031e..1a7096b 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
@@ -11,6 +11,7 @@
         <result property="voteRestrictions"     column="vote_restrictions"    />
         <result property="userRestrictions"    column="user_restrictions"    />
         <result property="endTime"              column="end_time"    />
+        <result property="startTime"              column="start_time"    />
         <result property="articleId"            column="article_id"    />
         <result property="createTime"            column="create_time"    />
         <result property="updateTime"            column="update_time"    />
@@ -32,6 +33,7 @@
             vote_restrictions,
             user_restrictions,
             end_time,
+            start_time,
             article_id,
             create_time,
             update_time,
@@ -54,6 +56,7 @@
         jpd.vote_restrictions,
         jpd.user_restrictions,
         jpd.end_time,
+        jpd.start_time,
         jpd.article_id,
         jpd.create_time,
         jpd.update_time,
@@ -66,7 +69,7 @@
         jpd.signature_flag,
         GROUP_CONCAT(jh.name) userName
         from jczz_public_discuss jpd
-        LEFT JOIN jczz_household jh on jpd.user_ids like CONCAT('%',jh.associated_user_id,'%')
+        LEFT JOIN jczz_household jh ON FIND_IN_SET ( jh.id, jpd.user_ids )
         <where>
             <if test="publicDiscuss.id != null "> and id = #{publicDiscuss.id}</if>
             <if test="publicDiscuss.title != null  and publicDiscuss.title != ''"> and title = #{publicDiscuss.title}</if>
@@ -120,6 +123,7 @@
         jpd.vote_restrictions,
         jpd.user_restrictions,
         jpd.end_time,
+        jpd.start_time,
         jpd.article_id,
         jpd.create_time,
         jpd.update_time,
@@ -130,7 +134,7 @@
         jpd.user_ids,
         jpd.event_type,
         jpd.signature_flag,
-        (SELECT user_id from jczz_user_public_enroll where user_id = #{userId} and article_id = jpd.article_id)userId
+        (SELECT household_id from jczz_user_public_enroll where household_id = #{householdId} and article_id = jpd.article_id)householdId
         from
         jczz_public_discuss jpd
         <where>

--
Gitblit v1.9.3