diff --git a/core/src/main/java/com/jinrui/reference/core/service/NewsInfoService.java b/core/src/main/java/com/jinrui/reference/core/service/NewsInfoService.java index 788a465..1ff6169 100644 --- a/core/src/main/java/com/jinrui/reference/core/service/NewsInfoService.java +++ b/core/src/main/java/com/jinrui/reference/core/service/NewsInfoService.java @@ -178,7 +178,7 @@ public class NewsInfoService { } private Long saveConceptLabel(String conceptLabel) { - String[] conceptTags = conceptLabel.split("-"); + final String[] conceptTags = conceptLabel.split("-"); Tag levelOneTag = new Tag(); levelOneTag.setParentId(6L); levelOneTag.setLevel(1); @@ -190,6 +190,7 @@ public class NewsInfoService { levelTwoTag.setLevel(2); levelTwoTag.setParentName(conceptTags[0]); levelTwoTag.setName(conceptTags[1]); + tagMapper.saveTag(levelTwoTag); return levelTwoTag.getId(); } return levelOneTag.getId(); diff --git a/core/src/main/java/com/jinrui/reference/core/service/NewsService.java b/core/src/main/java/com/jinrui/reference/core/service/NewsService.java index a37ff27..4d812c5 100644 --- a/core/src/main/java/com/jinrui/reference/core/service/NewsService.java +++ b/core/src/main/java/com/jinrui/reference/core/service/NewsService.java @@ -300,17 +300,19 @@ public class NewsService { for (NewsTagRel rel : tagRelList) { Long tagId = rel.getTagId(); Tag tag = tagMap.get(tagId); - Long parentId = tag.getParentId(); - NewsDetailTagItem tagItem = new NewsDetailTagItem(); - tagItem.setId(tagId); - tagItem.setName(tag.getName()); - tagItem.setParentName(tag.getParentName()); - if (parentId != null && parentId == 1) { - newsDetailTag.setSource(tagItem); - } else { -// newsDetailTag.setField(tagItem); - newsDetailTag.setField(tagItem); - arr.add(tagItem); + if (tag != null) { + Long parentId = tag.getParentId(); + NewsDetailTagItem tagItem = new NewsDetailTagItem(); + tagItem.setId(tagId); + tagItem.setName(tag.getName()); + tagItem.setParentName(tag.getParentName()); + if (parentId != null && parentId == 1) { + newsDetailTag.setSource(tagItem); + } else { +// newsDetailTag.setField(tagItem); + newsDetailTag.setField(tagItem); + arr.add(tagItem); + } } } newsDetailTag.setFieldArr(arr); @@ -323,11 +325,13 @@ public class NewsService { for (NewsIndustryRel rel: industryRelList) { Long industryId = rel.getIndustryId(); Industry industry = industryMap.get(industryId); - NewsDetailIndustry newsDetailIndustry = new NewsDetailIndustry(); - newsDetailIndustry.setId(industryId); - newsDetailIndustry.setPrimaryName(industry.getPrimaryName()); - newsDetailIndustry.setSecondaryName(industry.getSecondaryName()); - newsIndustryList.add(newsDetailIndustry); + if (industry != null) { + NewsDetailIndustry newsDetailIndustry = new NewsDetailIndustry(); + newsDetailIndustry.setId(industryId); + newsDetailIndustry.setPrimaryName(industry.getPrimaryName()); + newsDetailIndustry.setSecondaryName(industry.getSecondaryName()); + newsIndustryList.add(newsDetailIndustry); + } } } return ResultObject.success(newsDetailVO);