diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java
index d5aceb62a..b8c89c89f 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java
@@ -80,7 +80,7 @@ public class SupvAlarmBackController extends BaseController {
     @ApiOperation("分页查询预告警单反馈")
     @ApiImplicitParam(name = "param",value = "请求体",required = true)
     public HttpResult<Page<SupvAlarmBack>> pageAlarmBack(@RequestBody SupvAlarmBackParam param){
-        String methodDescribe = getMethodDescribe("pagePlanHis");
+        String methodDescribe = getMethodDescribe("pageAlarmBack");
         Page<SupvAlarmBack> supvPlanHisPage = supvAlarmBackService.pageAlarmBack(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supvPlanHisPage, methodDescribe);
     }
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml
index 0cdf60c0c..2c8142143 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml
@@ -11,6 +11,9 @@
             supv_alarm sa
         INNER JOIN supv_alarm_back sab on sab.work_Alarm_Id = sa.Alarm_Id
         <where>
+            <if test="param.workAlarmId != null and param.workAlarmId != ''">
+                AND sa.Alarm_Id = #{param.workAlarmId}
+            </if>
             <if test="param.searchBeginTime != null and param.searchBeginTime != ''">
                 AND DATE_FORMAT(sab.complete_Time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{param.searchBeginTime}, '%Y-%m-%d')
             </if>