Merge branch 'fixbug/group' into 'master'

bug:[none]空指针

See merge request rays/pcloud-book!1363

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java

@@ -834,7 +834,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         if (!ListUtils.isEmpty(activityGroupIds)) {
             localMap = pcloudGroupActivityDao.getByIds(activityGroupIds, 1);
         }
-        List<Long> firstClassifys = localMap.values().stream().filter(s->s.getFirstClassify()>0).map(GroupActivity4AppletDTO::getFirstClassify).distinct().collect(Collectors.toList());
+        List<Long> firstClassifys = localMap.values().stream().filter(s->null != s.getFirstClassify() && s.getFirstClassify()>0).map(GroupActivity4AppletDTO::getFirstClassify).distinct().collect(Collectors.toList());
         Map<Long, AssistTempletDTO> classifyMap = assistTempletConsr.mapByIds4Classify(firstClassifys);
         for(GroupActivity4AppletDTO groupActivity4AppletDTO: localMap.values()){
             String filterStr = StringUtilParent.replaceHtml(groupActivity4AppletDTO.getDesc());