From 09001482e420ec864cddba02499d9fc0e94bc44c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Mar 2024 11:24:43 +0800
Subject: [PATCH] 新增矛盾纠纷事发时间，导入，导出接口
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index f315c40..c359d35 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -233,10 +233,11 @@
)
</select>
- <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.system.entity.User">
+ <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.house.vo.HouseholdVO">
SELECT
- bu.id,
+ jh.*,
+ bu.id userId,
bu.tenant_id,
bu.code,
bu.user_type,
@@ -246,7 +247,9 @@
bu.avatar,
bu.email,
bu.phone,
- bu.birthday
+ bu.birthday,
+ jhe.building,
+ jhe.unit
FROM
blade_user bu
LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id and jh.is_deleted=0
--
Gitblit v1.9.3