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 0f1569b..9d9aaa3 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
@@ -122,18 +122,16 @@
     </select>
 
     <select id="selectKkjByWareHouseAndTime" resultType="map">
-        SELECT bki.ID           AS id,
-               bki.KKJ_CODE     AS kkjCode,
-               bki.KKJ_NAME     AS kkjName,
-               ak.ALARM_DEVCODE AS devcode
+        SELECT ak.ALARM_DEVCODE  AS devcode,
+               ak.ALARM_KKJ_CODE AS kkjCode,
+               bki.KKJ_NAME      AS kkjName,
+               bki.ID            AS id
         FROM bus_warehouse_info AS bwi
-                 LEFT JOIN bus_kkj_info AS bki
-                           ON (bwi.DEPTID = bki.DEPTID AND bki.VALID = '0')
-                 LEFT JOIN alarm_kkj AS ak
-                           ON (ak.ALARM_KKJ_CODE = bki.KKJ_CODE)
-        WHERE bwi.ID = #{wareHouseId}
-          AND DATE_FORMAT(ak.ALARM_DATE
-                  , '%Y-%m-%d') = #{date}
+                 LEFT JOIN alarm_kkj AS ak ON (bwi.`ID` = ak.ALARM_WAREHOUSE)
+                 LEFT JOIN bus_kkj_info AS bki ON (ak.ALARM_KKJ_CODE = bki.KKJ_CODE)
+        WHERE ak.ALARM_WAREHOUSE = #{wareHouseId}
+          AND DATE_FORMAT(ak.ALARM_DATE, '%Y-%m-%d') = #{date}
+          AND bki.VALID = '0'
     </select>
 
     <select id="selectKkjDetail" resultType="map">
@@ -223,6 +221,7 @@
         <if test="endDate!= null and endDate !=''">
             AND DATE_FORMAT(ak.ALARM_DATE,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
         </if>
+        ORDER BY ak.ALARM_DATE DESC
     </select>
 
     <select id="selectKkjRecords" resultType="map">