Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml

@@ -7,6 +7,7 @@
     <select id="selectLL" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
         SELECT t.* FROM
             (SELECT
+                DISTINCT pd.id AS id,
                 pr.GRID AS gridId,
                 pr.STAFF_ID,
                 pr.`STATUS`,
@@ -14,7 +15,12 @@
                 pd.LONGITUDE,
                 pd.SERIAL_NUM
             FROM staff_patrol_record pr
-            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)
+            INNER JOIN (
+        SELECT t.* FROM (SELECT DISTINCT pd.ID AS id, pd.STAFF_PATROL_REC_ID, pd.LATITUDE, pd.LONGITUDE, pd.SERIAL_NUM
+        FROM staff_patrol_detail pd
+        WHERE pd.DEL_FLAG = '0' ORDER BY pd.CREATED_TIME DESC) t
+        GROUP BY t.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 ">