Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -173,7 +173,7 @@ public class WebSocketConteoller extends BaseController {
         msgAlarmResp.setAlarmId(alarmId);
 
         LambdaQueryWrapper<MsgWebPush> lwMsgWebPush = new LambdaQueryWrapper<MsgWebPush>();
-        if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
+        if (!ObjectUtils.isEmpty(msgAlarm.getAlarmId())) {
             lwMsgWebPush.eq(MsgWebPush::getAlarmId, msgAlarm.getAlarmId());
         }
         List<MsgWebPush> msgWebPushList = msgWebPushService.list(lwMsgWebPush);