From 269b7d3e853794aefb36fab0fe8390f325d57374 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 04 Dec 2021 16:29:59 +0800
Subject: [PATCH] 1.数据库连接

---
 src/main/java/org/springblade/modules/location/mapper/LiveLocationMapper.xml |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springblade/modules/location/mapper/LiveLocationMapper.xml b/src/main/java/org/springblade/modules/location/mapper/LiveLocationMapper.xml
index 49f316b..31ea855 100644
--- a/src/main/java/org/springblade/modules/location/mapper/LiveLocationMapper.xml
+++ b/src/main/java/org/springblade/modules/location/mapper/LiveLocationMapper.xml
@@ -216,17 +216,22 @@
 
     <!--查询指令接收人的定位信息-->
     <select id="getDirectiveLiveLocationVo" resultType="org.springblade.modules.location.vo.LiveLocationVo">
-        select
-        *
-        from
-        sys_live_location
-        where
-        1=1
+        SELECT
+        l.*,
+        u.real_name as rname,
+        u.phone,
+        d.dept_name as deptname
+        FROM
+        sys_live_location l
+        LEFT JOIN blade_user u ON u.id = l.worker_id
+        LEFT JOIN blade_dept d ON u.dept_id = d.id
+        WHERE
+        1 =1
         <if test="liveLocation.type!=null and liveLocation.type!=''">
-            and type = #{liveLocation.type}
+            and l.type = #{liveLocation.type}
         </if>
         <if test="liveLocation.workerId!=null and liveLocation.workerId!=''">
-            and worker_id = #{liveLocation.workerId}
+            and l.worker_id = #{liveLocation.workerId}
         </if>
     </select>
 

--
Gitblit v1.9.3