告警

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/AlarmTypeDetailsServiceImpl.java

@@ -79,7 +79,9 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
     public Pagination<AlarmTypeDetailsEntityVo> selectPage(AlarmTypeDetailsDto dto, BasePageDto page) {
         dto.setState(AlarmStateEnum.REALTIME_ALARM.getCode());
         PageHelper.startPage(page.getPageNum(),page.getPageSize());
-        dto.setEndTime(DateUtil.endOfDay(dto.getEndTime()).toJdkDate());
+        if (dto.getEndTime() != null) {
+            dto.setEndTime(DateUtil.endOfDay(dto.getEndTime()).toJdkDate());
+        }
         return new Pagination<>(alarmTypeDetailMapper.selectList(dto, UserUtil.getCurrentUser().getUserCondition()));
     }