难点堵点bug

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

@@ -11,6 +11,7 @@ import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.dto.project.result.ProjectLatestOperationResultDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
+import com.epmet.dto.topic.TopicAttachmentDTO;
 import com.epmet.dto.topic.result.ResiTopicAndImgResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
@@ -289,16 +290,20 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
                 //获取图片及话题内容
                 ResiTopicAndImgResultDTO topicInfo = topicService.getTopicAndImgs(project.getTopicId(), "image");
                 if (topicInfo != null) {
-                    diffEntity.setEventImgUrl(topicInfo.getTopicImgList().get(NumConstant.ZERO).getAttachmentUrl());
+                    List<TopicAttachmentDTO> topicImgList = topicInfo.getTopicImgList();
+                    if (!CollectionUtils.isEmpty(topicImgList)){
+                        diffEntity.setEventImgUrl(topicImgList.get(NumConstant.ZERO).getAttachmentUrl());
+                        topicImgList.forEach(img -> {
+                            ScreenDifficultyImgDataEntity imgData = new ScreenDifficultyImgDataEntity();
+                            imgData.setEventId(project.getId());
+                            imgData.setEventImgUrl(img.getAttachmentUrl());
+                            imgData.setSort(img.getSort());
+                            imgDataEntities.add(imgData);
+                            imgData.setCustomerId(param.getCustomerId());
+                        });
+                    }
                     diffEntity.setEventContent(topicInfo.getTopicContent());
-                    topicInfo.getTopicImgList().forEach(img -> {
+
-                        ScreenDifficultyImgDataEntity imgData = new ScreenDifficultyImgDataEntity();
-                        imgData.setEventId(project.getId());
-                        imgData.setEventImgUrl(img.getAttachmentUrl());
-                        imgData.setSort(img.getSort());
-                        imgDataEntities.add(imgData);
-                        imgData.setCustomerId(param.getCustomerId());
-                    });
                     log.info("projectId:{} imgs:{}", project.getId(), imgDataEntities.stream().filter(o -> o.getEventId().equals(project.getId())).count());
                 }