From 1a00b6844d5d9b8f8656433f16eec44d2b068a14 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Thu, 15 Aug 2024 09:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=8B=E5=80=BC=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=B6=E6=B5=8B=E7=82=B9=E4=B8=BA=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/service/OsmoticPressRService.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java
index 8bba790..10878cb 100644
--- a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java
@@ -45,6 +45,10 @@ public class OsmoticPressRService extends ServiceImpl<OsmoticPressRMapper, Osmot
      * @return
      */
     public List<OsmoticStationVo> queryValue(OsmoticQuerySo osmoticQuerySo,Integer year) {
+        List<OsmoticStationVo> resList = new ArrayList<>();
+        if(CollectionUtils.isEmpty(osmoticQuerySo.getStationCodes())){
+            return resList;
+        }
         Boolean isDesc = true;
         //查询测站降雨量
         Map<String,BigDecimal> drpMap = new HashMap<>();
@@ -54,7 +58,7 @@ public class OsmoticPressRService extends ServiceImpl<OsmoticPressRMapper, Osmot
             drpMap = drpList.stream().collect(Collectors.toMap(StRzVo::getTm, StRzVo::getRz));
         }
         List<String> dateList = DateUtil.getDatesBetween(osmoticQuerySo.getDateTimeRangeSo().getStart(), osmoticQuerySo.getDateTimeRangeSo().getEnd(),isDesc);
-        List<OsmoticStationVo> resList = new ArrayList<>();
+
         //查询库水位
         List<StRzVo> list = baseMapper.queryRz(osmoticQuerySo);
         Map<String, BigDecimal> rzMap = list.stream().collect(Collectors.toMap(StRzVo::getTm, StRzVo::getRz));
@@ -78,6 +82,9 @@ public class OsmoticPressRService extends ServiceImpl<OsmoticPressRMapper, Osmot
     public List<OsmoticChartVo> queryChart(OsmoticQuerySo osmoticQuerySo,Integer year) {
         List<OsmoticChartVo> resList = new ArrayList<>();
         List<String> stationCodes = osmoticQuerySo.getStationCodes();
+        if(CollectionUtils.isEmpty(stationCodes)){
+            return resList;
+        }
         //查询库水位
         List<StRzVo> list = baseMapper.queryRz(osmoticQuerySo);
         //查询测站管水位
@@ -408,6 +415,9 @@ public class OsmoticPressRService extends ServiceImpl<OsmoticPressRMapper, Osmot
 
     public List<OsmoticPressDetailVo> detailValue(OsmoticDetailQuerySo so) {
         List<OsmoticPressDetailVo> list = baseMapper.detailValue(so);
+        if(so.getType() == 2){
+            return list;
+        }
         OsmoticQuerySo osmoticQuerySo = new OsmoticQuerySo();
         BeanUtils.copyProperties(so,osmoticQuerySo);
         List<StRzVo> stRzVos = baseMapper.queryLineRz(osmoticQuerySo);