diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5437b1d..ce23a5a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -260,6 +260,7 @@
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
         <where>
             bwi.VALID = '1'
+            AND ar.JOB_ID > 0
             <if test="alarmType != null ">
                 AND ar.ALARM_TYPE = #{alarmType}
             </if>
@@ -983,7 +984,7 @@
         ar.ALARM_CONTENT AS "alarmContentName",
         ar.STATUS AS "alarmStatus",
         aj.ID AS id,
-        aj.ID AS "jobId",
+        aj.JOB_ID AS "jobId",
         aj.JOG_TYPE AS "jobType",
         aj.JOBCODE AS "jobCode",
         aj.JOB_STATUS AS "jobStatus",
@@ -1072,7 +1073,8 @@
     </update>
 
     <update id="saveJob" flushCache="true">
-        update alarm_job set handle_message = #{handleMessage},
+        update alarm_job
+        set handle_message = #{handleMessage},
         handle_photos = #{handlePhotos}
         where id = #{id}
     </update>
@@ -1119,9 +1121,7 @@
     <update id="confirmOverAlarmRecords" flushCache="true">
      UPDATE alarm_records
      SET     status = 2
-     FROM    alarm_job
-     WHERE alarm_job.ID = ar.job_id
-     AND alarm_job.ID = #{id}
+     WHERE job_id = #{id}
     </update>
 
     <update id="overAlarm" flushCache="true">