合并bug处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -210,6 +210,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             EquipmentSpecificAlarmLog alarmLog = equipmentSpecificAlarmLogService.getById(ent.getId());
             List<EquipmentSpecificAlarmLog> list = null;
             String handleConfirm = ent.getHandleConfirm();
+            int isBatch = 0;
 
             if (!ObjectUtils.isEmpty(alarmLog)) {
                 Long equipmentSpecificAlarmId = alarmLog.getEquipmentSpecificAlarmId();
@@ -338,6 +339,8 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                         }).start();
                     }
                 }
+            //  如果是批量确警，先查询，再确警，用于批量消息推送
+            isBatch = ent.getIsBatch();
                 if (isBatch == 1 && CollectionUtils.isNotEmpty(list)) {
                     list.forEach(x ->{
                         if (!ObjectUtils.isEmpty(x)) {