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 queryValue(OsmoticQuerySo osmoticQuerySo,Integer year) { + List resList = new ArrayList<>(); + if(CollectionUtils.isEmpty(osmoticQuerySo.getStationCodes())){ + return resList; + } Boolean isDesc = true; //查询测站降雨量 Map drpMap = new HashMap<>(); @@ -54,7 +58,7 @@ public class OsmoticPressRService extends ServiceImpl dateList = DateUtil.getDatesBetween(osmoticQuerySo.getDateTimeRangeSo().getStart(), osmoticQuerySo.getDateTimeRangeSo().getEnd(),isDesc); - List resList = new ArrayList<>(); + //查询库水位 List list = baseMapper.queryRz(osmoticQuerySo); Map rzMap = list.stream().collect(Collectors.toMap(StRzVo::getTm, StRzVo::getRz)); @@ -78,6 +82,9 @@ public class OsmoticPressRService extends ServiceImpl queryChart(OsmoticQuerySo osmoticQuerySo,Integer year) { List resList = new ArrayList<>(); List stationCodes = osmoticQuerySo.getStationCodes(); + if(CollectionUtils.isEmpty(stationCodes)){ + return resList; + } //查询库水位 List list = baseMapper.queryRz(osmoticQuerySo); //查询测站管水位 @@ -408,6 +415,9 @@ public class OsmoticPressRService extends ServiceImpl detailValue(OsmoticDetailQuerySo so) { List list = baseMapper.detailValue(so); + if(so.getType() == 2){ + return list; + } OsmoticQuerySo osmoticQuerySo = new OsmoticQuerySo(); BeanUtils.copyProperties(so,osmoticQuerySo); List stRzVos = baseMapper.queryLineRz(osmoticQuerySo);