浏览代码

解决合同段没有设置地址时获取天气台账的时候获取到所有项目数据的问题

lvy 1 天之前
父节点
当前提交
4f7fa7ae6c

+ 4 - 0
blade-service/blade-business/src/main/java/org/springblade/business/controller/WeatherController.java

@@ -1,6 +1,7 @@
 package org.springblade.business.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -112,6 +113,9 @@ public class WeatherController {
         if (area == null) {
             return R.data(-1, null, "数据操作失败");
         }
+        if (area.getId() == null || area.getId() <= 0) {
+            return R.data(new Page<>());
+        }
         weatherMap.put("contractAreaId", area.getId());
 
         if (StringUtils.isNotEmpty(vo.getRecordTime())) {

+ 1 - 0
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/WeatherInfoServiceImpl.java

@@ -462,6 +462,7 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
                 if (map != null && map.get("nums") != null) {
                     stringRedisTemplate.opsForValue().set("blade-business::contractArea:yiKeYun:historyWeatherNums", map.get("nums"), getSecondsUntilMidnight(), TimeUnit.SECONDS);
                 }
+                historyWeather.remove("nums");
             }
             return historyWeather;
         } else {