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 | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 fa8d80f..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 != ''">
@@ -149,6 +156,9 @@
<if test="user.nativeplace!=null and user.nativeplace != ''">
and bu.nativeplace = #{user.nativeplace}
</if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and bu.dept_id = #{user.deptId}
+ </if>
<if test="user.sex!=null and user.sex != ''">
and bu.sex = #{user.sex}
</if>
@@ -158,13 +168,13 @@
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
</if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and bu.jurisdiction = #{user.jurisdiction}
- </if>
+ and bu.jurisdiction = #{user.jurisdiction}
+ </if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
<if test="deptIdList!=null and deptIdList.size>0">
- and id in (
+ and bu.id in (
SELECT
user_id
FROM
--
Gitblit v1.9.3