From e3caebf17708e4f7eda618986d82a910d4cdb4e2 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Sat, 20 Apr 2024 13:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/PersonnelControlMapper.xml         | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
index a56c673..89f8ac0 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
@@ -103,22 +103,17 @@
     </select>
     <select id="personnelCoordinatePoint" resultType="com.securitycontrol.entity.screen.vo.PersonnelControlVo">
         SELECT
-            tbd.device_id AS deviceId,
-            group_concat(tdd.mode_name) AS modeName,
-            group_concat(tdv.val) AS val,
-            group_concat(su.phone) AS phone,
-            group_concat(su.org_name) AS orgName,
-            group_concat(su.user_name) AS userName
-        FROM
-            tb_bd_device tbd
-                LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
-                LEFT JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id
-                LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
-                LEFT JOIN sys_user su ON tdv.val = su.user_id and tdd.mode_name = '绑定人'
-        WHERE
-            tpb.bid_code = #{bidCode} and tbd.devic_type = '1905'
-        GROUP BY
-            tbd.device_id
+            GROUP_CONCAT(tdd.mode_name) AS modeName,
+            GROUP_CONCAT(tdv.val) AS val,
+            ttp.user_name AS userName,
+            ttp.phone
+         FROM tb_bd_device tbd
+         INNER JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id AND tpb.del_flag = 0 AND tpb.bid_code = #{bidCode}
+         INNER JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id AND tdd.del_flag = 0
+         INNER JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
+         LEFT JOIN t_team_people ttp ON ttp.user_id = tdv.val AND ttp.del_falge = '0' AND tdd.mode_name = '绑定人'
+         WHERE tbd.devic_type = '1905' AND tbd.del_flag = 0
+         GROUP BY tbd.device_id
     </select>
 
     <select id="personnelHistoricalCoordinates"