Merge remote-tracking branch 'origin/main'

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java

@@ -677,6 +677,10 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
 
 
     private List<PollutionLineDTO> commDataDeal(List<String> ids, PollutionParamDTO paramDTO, HarmonicPublicParam harmonicPublicParam) {
+        //添加非空判断
+        if(CollectionUtils.isEmpty(ids)){
+            return  new ArrayList<>();
+        }
         paramDTO.setLineList(ids);
         List<PollutionLineDTO> list = lineFeignClient.getLineInfo(paramDTO).getData();
         List<RMpPollutionDPO> lineData = rMpPollutionDPOMapper.selectMaxList(ids, harmonicPublicParam.getStatisticalType().getId(), harmonicPublicParam.getSearchBeginTime(), harmonicPublicParam.getSearchEndTime());