修改提交

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EquipAlarmEventServiceImpl.java

@@ -51,7 +51,7 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
         //  equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper);
         //  equipAlarmEvents=page.getRecords();
         equipAlarmEvents.forEach(i->{
-        	if("true".equals(i)) 
+        	if("true".equals(i.getValue())) 
         	{
         		i.setValue("合");
         	}else 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -2125,8 +2125,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 			shouldCondtion.put(CommonConstans.QueryStringFrontMoudle, "箱变");
 			List<ESEquipments> indicatorsDtoListXB = commonServiceImpl.getListDataByCondtions(queryCondtion,
 					shouldCondtion, ESEquipments.class);
-			indicatorsDtoList.addAll(indicatorsDtoListHLX);
-			indicatorsDtoList.addAll(indicatorsDtoListXB);
+			nindicatorsDtoList.addAll(indicatorsDtoListHLX);
+			nindicatorsDtoList.addAll(indicatorsDtoListXB);
 
 			List<EquipAlarmEvent> newEquipAlarmEvents = new ArrayList<>();
 			List<EquipAlarmEvent> newEquipAlarmEvent = new ArrayList<>();