diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 4190f17..aafb00b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -79,7 +79,7 @@
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 4190f17..aafb00b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -79,7 +79,7 @@
         bwi.DEPTID AS "deptid"
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
-        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
         JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index 179d91c..0bbb52c 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -46,7 +46,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "ceshi";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();