From 2540926af522c0b029e89e577a81b7f4f86e27ae Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 4 Aug 2021 10:55:57 +0800
Subject: [PATCH] =?UTF-8?q?sql=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/StaffPatrolRecordDao.xml         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml
index d3d5b53bb3..a514e59f47 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml
@@ -7,7 +7,6 @@
     <select id="selectLL" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
         SELECT t.* FROM
             (SELECT
-                distinct(pr.ID) AS ID,
                 pr.GRID AS gridId,
                 pr.STAFF_ID,
                 pr.`STATUS`,
@@ -15,7 +14,7 @@
                 pd.LONGITUDE,
                 pd.SERIAL_NUM
             FROM staff_patrol_record pr
-            LEFT JOIN staff_patrol_detail pd ON pd.STAFF_PATROL_REC_ID = pr.ID AND pd.DEL_FLAG = 0
+            INNER JOIN (SELECT MAX(pd.CREATED_TIME) , pd.STAFF_PATROL_REC_ID, pd.LATITUDE, pd.LONGITUDE,pd.SERIAL_NUM FROM staff_patrol_detail pd WHERE pd.DEL_FLAG = '0' GROUP BY pd.STAFF_PATROL_REC_ID) pd ON(pd.STAFF_PATROL_REC_ID = pr.ID)
             WHERE pr.DEL_FLAG = 0
                 AND (
                 <foreach collection="userIds" item="userId" separator=" OR ">