Browse Source

Merge branch 'wyp/0509-export' of Server/long-article-recommend into master

wangyunpeng 3 weeks ago
parent
commit
dedd62e226

+ 11 - 6
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/DataDashboardService.java

@@ -560,13 +560,18 @@ public class DataDashboardService {
             if (CollectionUtils.isNotEmpty(inputSourceValues)) {
                 List<CrawlerPlan> crawlerPlanItemList = new ArrayList<>();
                 for (CrawlerPlanResultRel crawlerPlanResultRel : crawlerPlanRelList) {
-                    crawlerPlanItemList.add(crawlerPlanMap.get(crawlerPlanResultRel.getPlanId()));
+                    CrawlerPlan crawlerPlan = crawlerPlanMap.get(crawlerPlanResultRel.getPlanId());
+                    if (Objects.nonNull(crawlerPlan)) {
+                        crawlerPlanItemList.add(crawlerPlan);
+                    }
                 }
-                for (CrawlerPlan crawlerPlan : crawlerPlanItemList) {
-                    if (inputSourceValues.contains(crawlerPlan.getId())) {
-                        obj.setCrawlerPlanName(crawlerPlan.getName());
-                        obj.setCrawlerPlanTag(crawlerPlan.getPlanTag());
-                        break;
+                if (CollectionUtils.isNotEmpty(crawlerPlanItemList)) {
+                    for (CrawlerPlan crawlerPlan : crawlerPlanItemList) {
+                        if (inputSourceValues.contains(crawlerPlan.getId())) {
+                            obj.setCrawlerPlanName(crawlerPlan.getName());
+                            obj.setCrawlerPlanTag(crawlerPlan.getPlanTag());
+                            break;
+                        }
                     }
                 }
             }