Merge branch 'v2.3.1' into 'dev'

npe fix

See merge request !84

community-service/src/main/java/com/tanpu/community/service/TopicService.java

@@ -240,34 +240,43 @@ public class TopicService {
                 } else {
                     fund = Arrays.asList(new ProductInfoVO());
                 }
+                if (CollectionUtils.isNotEmpty(fund)) {
                     TopicAttachment attach = TopicAttachment.builder().type(RelTypeEnum.FUND.type)
                             .subType(String.valueOf(entity.getSubjectSubType()))
                             .detail(TopicAttachmentDetail.builder().fund(fund.get(0)).build()).build();
                     attachements.add(attach);
+                }
             } else if (RelTypeEnum.FUND_COMPANY.type.equals(entity.getSubjectType().toString())) {
                 // 资管人
                 List<FundCompanyVO> fundCompany = feignService.getFundCompany(Collections.singletonList(entity.getSubjectId()));
+                if (CollectionUtils.isNotEmpty(fundCompany)) {
                     FundCompanyVO company = fundCompany.get(0);
                     company.setType(String.valueOf(entity.getSubjectSubType())); // 公司类型
                     TopicAttachment attach = TopicAttachment.builder().type(RelTypeEnum.FUND_COMPANY.type)
                             .detail(TopicAttachmentDetail.builder().fundCompany(company).build()).build();
                     attachements.add(attach);
+                }
 
             } else if (RelTypeEnum.NEW_COURSE_WARE.type.equals(entity.getSubjectType().toString())) {
                 // 课程包
                 List<CoursePackageSimpleResp> coursePackage = feignService.getCoursePackageList(Collections.singletonList(entity.getSubjectId()));
+                if (CollectionUtils.isNotEmpty(coursePackage)){
                     TopicAttachment attach = TopicAttachment.builder().type(RelTypeEnum.NEW_COURSE_WARE.type)
                             .detail(TopicAttachmentDetail.builder().coursePackage(coursePackage.get(0)).build()).build();
                     attachements.add(attach);
+                }
+
 
             } else if (RelTypeEnum.OFFLINE_ACTIVITY.type.equals(entity.getSubjectType().toString())) {
                 // 线下活动
                 List<OfflineActivitySimpleResp> activitySimpleList = feignService.getActivitySimpleList(Collections.singletonList(entity.getSubjectId()));
+                if (CollectionUtils.isNotEmpty(activitySimpleList)){
                     TopicAttachmentDetail detailVo = TopicAttachmentDetail.builder().activity(activitySimpleList.get(0)).build();
                     TopicAttachment attach = TopicAttachment.builder().type(RelTypeEnum.OFFLINE_ACTIVITY.type).detail(detailVo).build();
                     attachements.add(attach);
                 }
             }
+        }
 
 
         topic.setAttachments(attachements);