From 0ffd29c2af0476ffd9416cf5eb555de9bbf0d6f9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 30 Jul 2021 15:52:55 +0800
Subject: [PATCH] 发送指令接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 591b6a2..d14c5ad 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.system.mapper.UserMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="userResultMap" type="org.springblade.modules.system.entity.User">
+ <resultMap id="userResultMap" type="org.springblade.modules.system.vo.UserVO">
<result column="id" property="id"/>
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
@@ -43,12 +43,19 @@
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
- select bu.* from
+ select
+ bu.*,
+ sll.longitude,sll.latitude
+ from
blade_user bu
left join
blade_dept bd
on
bu.dept_id = bd.id
+ left join
+ sys_live_location sll
+ on
+ sll.worker_id = bu.id
where
bu.is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
--
Gitblit v1.9.3