From d30cb3e464ed67a1e3371197c2e0e24f5c704748 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 29 Jul 2021 20:36:57 +0800
Subject: [PATCH] 保安员信息查询接口修改，新增经纬度返回
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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..1de02b3 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -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