From bb0f1dcb8684cfa01a7b9d4315e8fcfc03761858 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 16 Jun 2021 14:27:52 +0800
Subject: [PATCH] =?UTF-8?q?gridId=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/RecordListFormDTO.java   | 1 -
 .../src/main/resources/mapper/StaffPatrolRecordDao.xml    | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java
index cfaf7a62c4..8d5f8413f1 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java
@@ -20,7 +20,6 @@ public class RecordListFormDTO implements Serializable {
     @NotBlank(message = "staffId不能为空",groups = RecordListForm.class)
     private String staffId;
 
-    @NotBlank(message = "网格ID不能为空",groups = RecordListForm.class)
     private String gridId;
 
 }
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 2e760a499e..002c2372b9 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
@@ -29,12 +29,14 @@
     <select id="recordList" resultType="com.epmet.dto.result.RecordListResultDTO">
         SELECT
             ID AS staffPatrolRecId,
-            DATE_FORMAT(PATROL_START_TIME,'%Y-%m-%d %H:%i:%s') AS patrolStartTime,
-            DATE_FORMAT(PATROL_END_TIME,'%Y-%m-%d %H:%i:%s') AS patrolEndTime,
+            IFNULL(DATE_FORMAT(PATROL_START_TIME,'%Y-%m-%d %H:%i:%s'),'') AS patrolStartTime,
+            IFNULL(DATE_FORMAT(PATROL_END_TIME,'%Y-%m-%d %H:%i:%s'),'') AS patrolEndTime,
             `STATUS`
         FROM staff_patrol_record
         WHERE DEL_FLAG = 0
-          AND GRID = #{gridId}
+          <if test="gridId != '' and gridId != null ">
+              AND GRID = #{gridId}
+          </if>
           AND STAFF_ID = #{staffId}
         ORDER BY CREATED_TIME DESC
     </select>