diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java index fa8f5312e..673448c6c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java @@ -521,10 +521,12 @@ public class TowerServiceImpl extends ServiceImpl implements } else { //从塔吊-人员考勤里面获取人员信息 driverVO = towerWorkerAttendanceMapper.getNewestWorkerInfo(driver.getDevSn()); - driverVO.setContinuousWorkingTimeName(TimeUtil.toHourMinSecond(driver.getContinuousWorkingTime())); + if (driverVO != null) { + driverVO.setContinuousWorkingTimeName(TimeUtil.toHourMinSecond(driver.getContinuousWorkingTime())); + } } return driverVO; - }).collect(Collectors.toList()); + }).filter(Objects::nonNull).collect(Collectors.toList()); DevWorkerVO devWorker = new DevWorkerVO(tower.getDevName(), tower.getDevSn(), tower.getRegistNo(), tower.getFactoryName(), null, driverList, null); TowerDataInfoDTO towerDataInfo = new TowerDataInfoDTO().setForearmLength(tower.getForearmLength()).setTowerHeight(tower.getTowerHeight()); if (newData != null) {