难点赌点

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

@@ -163,10 +163,11 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         Map<String,String> contentMap = topicService.getTopicContent(projectSourceMap);
 
         difficulties.forEach( diff -> {
-            if(!CollectionUtils.isEmpty(imgMap)) {
-                List<ScreenDifficultyImgDataEntity> figureList = imgMap.get(diff.getEventId());
+
+                List<ScreenDifficultyImgDataEntity> figureList = CollectionUtils.isEmpty(imgMap) ? null : imgMap.get(diff.getEventId());
                 diff.setEventImgUrl(CollectionUtils.isEmpty(figureList) ? "" : figureList.get(NumConstant.ZERO).getEventImgUrl());
-            }
+
+
             if(!CollectionUtils.isEmpty(contentMap)) {
                 diff.setEventContent(contentMap.get(diff.getEventId()));
             }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml

@@ -225,6 +225,7 @@
         resi_topic_attachment
         WHERE
         DEL_FLAG = '0'
+        AND ATTACHMENT_TYPE = 'image'
         <foreach collection="list" item="item" open="AND (" separator=" OR " close=")">
             TOPIC_ID = #{item.sourceId}
         </foreach>