From cac3a422abbc0fe4c9b260ae4d63b8e267035a97 Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Mon, 14 Jul 2025 10:03:03 +0800
Subject: [PATCH] .

---
 .../gunshi/project/xyt/service/RainBasinDivisionService.java   | 3 +++
 src/main/resources/mapper/StWaterRRealMapper.xml               | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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<StPptnVo> 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<Integer> 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 @@
     <select id="listRelated" resultType="com.gunshi.project.xyt.model.StWaterRReal">
         SELECT stb.stcd, stb.sttp, t.tm, t.q, t.v
         FROM public.st_stbprp_b stb
-            LEFT JOIN public.st_water_r_real t ON t.stcd = stb.stcd
+            JOIN public.st_water_r_real t ON t.stcd = stb.stcd
         <where>
             stb.sttp in ('QQ', 'PQ')
         </where>