From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 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..d44423e 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml
@@ -34,6 +34,7 @@
jup.create_time,
jup.update_time,
jup.deleted_flag,
+ jup.signature_path,
bu.avatar,
bu.`name`,
bu.phone,
@@ -42,7 +43,9 @@
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
+ AND bu.is_deleted = 0
+ LEFT JOIN jczz_household jh ON jh.house_code = jup.house_code
+ AND jh.is_deleted = 0 and jup.user_id =jh.associated_user_id
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
<where>
<if test="userPublicEnroll.id != null "> and jup.id = #{userPublicEnroll.id}</if>
@@ -51,6 +54,7 @@
<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