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/UserPublicEnrollMapper.xml | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml
index 13d47f4..7ff0b51 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="userPublicEnrollResultMap" type="org.springblade.modules.discuss.vo.UserPublicEnrollVO">
<result property="id" column="id" />
<result property="publicDiscussId" column="public_discuss_id" />
- <result property="userId" column="user_id" />
+ <result property="householdId" column="household_id" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="deletedFlag" column="deleted_flag" />
@@ -30,27 +30,32 @@
SELECT
jup.id,
jup.public_discuss_id,
- jup.user_id,
+ jup.household_id,
jup.create_time,
jup.update_time,
jup.deleted_flag,
+ jup.signature_path,
bu.avatar,
- bu.`name`,
- bu.phone,
+ jh.`name`,
+ jh.phone_number phone,
jda.address_name,
jda.aoi_name
FROM
jczz_user_public_enroll jup
- LEFT JOIN blade_user bu ON jup.user_id = bu.id
- LEFT JOIN jczz_household jh ON jh.associated_user_id = jup.user_id
+ LEFT JOIN jczz_household jh ON jh.house_code = jup.house_code
+ AND jh.is_deleted = 0
+ AND jup.household_id = jh.id
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
+ LEFT JOIN blade_user bu ON jh.associated_user_id = bu.id
+ AND bu.is_deleted = 0
<where>
<if test="userPublicEnroll.id != null "> and jup.id = #{userPublicEnroll.id}</if>
<if test="userPublicEnroll.publicDiscussId != null "> and jup.public_discuss_id = #{userPublicEnroll.publicDiscussId}</if>
- <if test="userPublicEnroll.userId != null "> and jup.user_id = #{userPublicEnroll.userId}</if>
+ <if test="userPublicEnroll.householdId != null "> and jup.household_id = #{userPublicEnroll.householdId}</if>
<if test="userPublicEnroll.createTime != null "> and jup.create_time = #{userPublicEnroll.createTime}</if>
<if test="userPublicEnroll.updateTime != null "> and jup.update_time = #{userPublicEnroll.updateTime}</if>
<if test="userPublicEnroll.deletedFlag != null "> and jup.deleted_flag = #{userPublicEnroll.deletedFlag}</if>
+ <if test="userPublicEnroll.articleId != null ">and jup.article_id = #{userPublicEnroll.articleId}</if>
</where>
</select>
--
Gitblit v1.9.3