增加判断

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml

@@ -17,7 +17,7 @@
 		</where>
 		GROUP BY  `state`
 	</select>
-    
+
 	<select id="list" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto">
 		SELECT * FROM house_pv_data.td_hygf_jp_inverter_warn
 		<where>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -133,7 +133,11 @@ public class JpStationController extends BaseController {
             LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
             qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
             List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
-            reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
+            if(pPersonStation!=null&&!pPersonStation.isEmpty()){
+                reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
+            }else{
+                ResponseHelper.buildResponse(null);
+            }
 //        }
         Page<JpStationDto> page=jpStationServiceImpl.queryForJpStationPage(current,size,reviewDto);
         return ResponseHelper.buildResponse(page);
@@ -162,7 +166,12 @@ public class JpStationController extends BaseController {
         LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
         qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
         List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
-        reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
+
+        if(pPersonStation!=null&&!pPersonStation.isEmpty()){
+            reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
+        }else{
+            ResponseHelper.buildResponse(null);
+        }
         List<Map<String,Object>>  listCollector=  jpCollectorMapper.queryCollectorCountStatus(reviewDto);
         List<Map<String,Object>>  listInverter=  jpInverterMapper.queryInverterCountStatus(reviewDto);
         Map<String,Object> map=new HashMap<>();
@@ -223,7 +232,11 @@ public class JpStationController extends BaseController {
             LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
             qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
             List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
-            reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
+            if(pPersonStation!=null&&!pPersonStation.isEmpty()){
+                reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
+            }else{
+                ResponseHelper.buildResponse(null);
+            }
       }
         return ResponseHelper.buildResponse(jpStationMapper.queryCount(reviewDto));
     }