diff --git a/src/main/java/com/zcloud/controller/dw/DwController.java b/src/main/java/com/zcloud/controller/dw/DwController.java
index 9dfb6123..4327780d 100644
--- a/src/main/java/com/zcloud/controller/dw/DwController.java
+++ b/src/main/java/com/zcloud/controller/dw/DwController.java
@@ -51,7 +51,7 @@ public class DwController extends BaseController {
         if (mapGet.getPage() == null){
             mapGet.setPage(new com.zcloud.service.dw.dto.Page());
         }
-        mapGet.getPage().setCurrent(String.valueOf(page.getCurrentPage()));
+        mapGet.getPage().setCurrent(String.valueOf(page.getUrlCurrentPage()));
         mapGet.getPage().setSize(String.valueOf(page.getShowCount()));
         return dwService.getAlarmList(mapGet);
     }
@@ -60,6 +60,7 @@ public class DwController extends BaseController {
     public Object manageAlarm() throws Exception {
         PageData pd = this.getPageData();
         AlarmManageDto mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), AlarmManageDto.class);
+        mapGet.setAlarmId(pd.getString("DW_ALARM_ID"));
         return dwService.manageAlarm(mapGet);
     }