Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -96,7 +96,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         List<DimGridEntity> orgList = dimGridService.getGridListByCustomerId(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(orgList)) {
             log.warn("抽取【公众参与-人均议题】，获取组织数据失败");
-            throw new RenException("抽取【公众参与-人均议题】，获取组织数据失败");
+            return;
         }
         //构建组织数据
         Map<String, ScreenUserJoinEntity> insertMap = new HashMap<>();
@@ -172,7 +172,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         List<DimAgencyEntity> orgList = dimAgencyService.getAgencyListByCustomerId(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(orgList)) {
             log.warn("抽取【公众参与-人均议题】，获取组织数据失败");
-            throw new RenException("抽取【公众参与-人均议题】，获取组织数据失败");
+            return;
         }
         //构建组织数据
         Map<String, ScreenUserJoinEntity> insertMap = new HashMap<>();