Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506

hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java

@@ -487,9 +487,11 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor
                         fdpRunReportVO.setIndex(index);
                         fdpRunReportVO.setLastBeginTime(fdpFaultHistoryDataEntity.getCreateTime());
                         fdpRunReportVO.setType("智能预警");
-                        fdpRunReportVO.setOrd(fdpFaultHistoryDataEntity.getOrd());
+                        fdpRunReportVO.setOrd(fdpFaultHistoryDataEntity.getOrd()==null?"":fdpFaultHistoryDataEntity.getOrd());
                         List<StationEntity> stationEntities = stationEntityList.stream().filter(s -> s.getCode().equals(fdpFaultHistoryDataEntity.getStation())).collect(Collectors.toList());
+                        if (CollectionUtil.isNotEmpty(stationEntities)){
                             fdpRunReportVO.setStation(stationEntities.get(0).getName());
+                        }
                         fdpRunReportVO.setContent(fdpFaultHistoryDataEntity.getName());
                         fdpRunReportVO.setNum(String.valueOf(fdpFaultHistoryDataEntities.size()));
                         fdpRunReportVO.setReason(fdpFaultHistoryDataEntity.getDiagReason());