From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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 a8e54b0..a0646c9 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserPublicEnrollMapper.xml
@@ -3,13 +3,13 @@
<mapper namespace="org.springblade.modules.discuss.mapper.UserPublicEnrollMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="userPublicEnrollResultMap" type="org.springblade.modules.discuss.entity.UserPublicEnrollEntity">
+ <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="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
- <result property="deleteFlag" column="delete_flag" />
+ <result property="deletedFlag" column="deleted_flag" />
</resultMap>
<sql id="selectUserPublicEnroll">
@@ -19,7 +19,7 @@
user_id,
create_time,
update_time,
- delete_flag
+ deleted_flag
from
jczz_user_public_enroll
</sql>
@@ -27,7 +27,35 @@
<select id="selectUserPublicEnrollPage" resultMap="userPublicEnrollResultMap">
- select * from jczz_user_public_enroll where deleted_flag = 0
+ SELECT
+ jup.id,
+ jup.public_discuss_id,
+ jup.user_id,
+ jup.create_time,
+ jup.update_time,
+ jup.deleted_flag,
+ jup.signature_path,
+ bu.avatar,
+ bu.`name`,
+ bu.phone,
+ jda.address_name,
+ jda.aoi_name
+ FROM
+ jczz_user_public_enroll jup
+ LEFT JOIN blade_user bu ON jup.user_id = bu.id
+ AND bu.is_deleted = 0
+ LEFT JOIN jczz_household jh ON jh.associated_user_id = jup.user_id
+ AND jh.is_deleted = 0
+ 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>
+ <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.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>
<select id="selectUserPublicEnrollList" parameterType="org.springblade.modules.discuss.dto.UserPublicEnrollDTO" resultMap="userPublicEnrollResultMap">
@@ -38,7 +66,7 @@
<if test="userId != null "> and user_id = #{userId}</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
- <if test="deleteFlag != null "> and delete_flag = #{deleteFlag}</if>
+ <if test="deletedFlag != null "> and deleted_flag = #{deletedFlag}</if>
</where>
</select>
--
Gitblit v1.9.3