diff --git a/src/main/java/com/gunshi/project/xyt/service/RainBasinDivisionService.java b/src/main/java/com/gunshi/project/xyt/service/RainBasinDivisionService.java index e3ca449..86b6e83 100644 --- a/src/main/java/com/gunshi/project/xyt/service/RainBasinDivisionService.java +++ b/src/main/java/com/gunshi/project/xyt/service/RainBasinDivisionService.java @@ -462,6 +462,9 @@ public class RainBasinDivisionService { public StPptnRReal maxRain(StPptnSo stPptnSo) { StPptnRReal stPptnRReal = new StPptnRReal(); List stPptnVos = realRainMapper.queryStPptnPerHourByStcdAndStartTimeAndEndTime(stPptnSo.getStcd(), stPptnSo.getStartTime(), stPptnSo.getEndTime()); + if (stPptnVos == null || stPptnVos.isEmpty()) { + return null; + } stPptnRReal.setH1(stPptnVos.stream().max(Comparator.comparing(StPptnVo::getSumDrp)).get().getSumDrp()); Collections.reverse(stPptnVos); List list = Arrays.asList(3, 6, 12); diff --git a/src/main/resources/mapper/StWaterRRealMapper.xml b/src/main/resources/mapper/StWaterRRealMapper.xml index 9562afd..e1e5bd8 100644 --- a/src/main/resources/mapper/StWaterRRealMapper.xml +++ b/src/main/resources/mapper/StWaterRRealMapper.xml @@ -5,7 +5,7 @@