diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml
index c2232ea..0f1569b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml
@@ -163,18 +163,20 @@
 
     <!--仓库在某天发生位移报警开孔机数目-->
     <select id="selectWarehouseWarnKkjByTime" resultType="map">
-        SELECT bwi.ID                  AS id,
-               bwi.`NAME`              AS `name`,
-               bwi.LAT                 AS lat,
-               bwi.LNG                 AS lng,
-               bwi.DEPTID              AS deptId,
-               COUNT(ak.ALARM_DEVCODE) AS alarmDevices
+        SELECT bwi.ID AS id,
+        bwi.`NAME` AS `name`,
+        bwi.LAT AS lat,
+        bwi.LNG AS lng,
+        bwi.DEPTID AS deptId,
+        COUNT(ak.ALARM_DEVCODE) AS alarmDevices
         FROM bus_warehouse_info AS bwi
-                 LEFT JOIN bus_kkj_info AS bki ON (bki.DEPTID = bwi.DEPTID)
-                 LEFT JOIN alarm_kkj AS ak ON (ak.ALARM_KKJ_CODE = bki.KKJ_CODE)
+        LEFT JOIN bus_kkj_info AS bki ON (bki.DEPTID = bwi.DEPTID)
+        LEFT JOIN alarm_kkj AS ak ON (ak.ALARM_KKJ_CODE = bki.KKJ_CODE)
         WHERE ak.ALARM_DEVCODE IS NOT NULL
-          AND bki.VALID = '0'
-          AND (DATE_FORMAT(ak.ALARM_DATE, '%Y-%m-%d') = #{date})
+        AND bki.VALID = '0'
+        <if test="date!= null and date !=''">
+            AND (DATE_FORMAT(ak.ALARM_DATE, '%Y-%m-%d') = #{date})
+        </if>
         GROUP BY bwi.ID
         ORDER BY bwi.ID ASC
     </select>

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml
index c2232ea..0f1569b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml
@@ -163,18 +163,20 @@
 
     <!--仓库在某天发生位移报警开孔机数目-->
     <select id="selectWarehouseWarnKkjByTime" resultType="map">
-        SELECT bwi.ID                  AS id,
-               bwi.`NAME`              AS `name`,
-               bwi.LAT                 AS lat,
-               bwi.LNG                 AS lng,
-               bwi.DEPTID              AS deptId,
-               COUNT(ak.ALARM_DEVCODE) AS alarmDevices
+        SELECT bwi.ID AS id,
+        bwi.`NAME` AS `name`,
+        bwi.LAT AS lat,
+        bwi.LNG AS lng,
+        bwi.DEPTID AS deptId,
+        COUNT(ak.ALARM_DEVCODE) AS alarmDevices
         FROM bus_warehouse_info AS bwi
-                 LEFT JOIN bus_kkj_info AS bki ON (bki.DEPTID = bwi.DEPTID)
-                 LEFT JOIN alarm_kkj AS ak ON (ak.ALARM_KKJ_CODE = bki.KKJ_CODE)
+        LEFT JOIN bus_kkj_info AS bki ON (bki.DEPTID = bwi.DEPTID)
+        LEFT JOIN alarm_kkj AS ak ON (ak.ALARM_KKJ_CODE = bki.KKJ_CODE)
         WHERE ak.ALARM_DEVCODE IS NOT NULL
-          AND bki.VALID = '0'
-          AND (DATE_FORMAT(ak.ALARM_DATE, '%Y-%m-%d') = #{date})
+        AND bki.VALID = '0'
+        <if test="date!= null and date !=''">
+            AND (DATE_FORMAT(ak.ALARM_DATE, '%Y-%m-%d') = #{date})
+        </if>
         GROUP BY bwi.ID
         ORDER BY bwi.ID ASC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java
index fa63abe..cdfabb5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java
@@ -77,18 +77,21 @@
         List<Map<String, Object>> warnKkj = this.baseMapper.selectWarehouseWarnKkjByTime(date);
         List<WarehouseListDTO> listDtos = new ArrayList<>();
         for (Map<String, Object> objectMap : allKkj) {
-            WarehouseListDTO warehouseListDto = new WarehouseListDTO(objectMap);
+            if (objectMap != null) {
+                WarehouseListDTO warehouseListDto = new WarehouseListDTO(objectMap);
+                Object allDevices = objectMap.get("allDevices");
+                warehouseListDto.setAllDevices(allDevices == null ? 0 : Integer.parseInt(allDevices.toString()));
 
-            Object allDevices = objectMap.get("allDevices");
-            warehouseListDto.setAllDevices(allDevices == null ? 0 : Integer.parseInt(allDevices.toString()));
-
-            for (Map<String, Object> warnKkjMap : warnKkj) {
-                if (warehouseListDto.getDeptId().equals(warnKkjMap.get("deptId").toString())) {
-                    Object alarmDevices = warnKkjMap.get("alarmDevices");
-                    warehouseListDto.setAlarmDevices(alarmDevices == null ? 0 : Integer.parseInt(alarmDevices.toString()));
+                for (Map<String, Object> warnKkjMap : warnKkj) {
+                    if (warnKkjMap != null) {
+                        if (warehouseListDto.getDeptId().equals(warnKkjMap.get("deptId").toString())) {
+                            Object alarmDevices = warnKkjMap.get("alarmDevices");
+                            warehouseListDto.setAlarmDevices(alarmDevices == null ? 0 : Integer.parseInt(alarmDevices.toString()));
+                        }
+                    }
                 }
+                listDtos.add(warehouseListDto);
             }
-            listDtos.add(warehouseListDto);
         }
         return listDtos;
     }