Merge branch 'fixbug/optimizeTypeNull' into 'master'

bug: [none] 分组类型为null时，提示空指针异常

See merge request rays/pcloud-book!793

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -868,19 +868,24 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 Long classifyId = groupActivity4AppletDTO.getClassifyId();
                 String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(classifyId);
                 // 通过群二维码链接反查群ID 并补充信息
-                ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, classifyId);
-                groupActivity4AppletDTO.setBookGroupQrcodeId(groupQrcodeInfo.getId());
-                groupActivity4AppletDTO.setGroupName(groupQrcodeInfo.getGroupName());
-                groupActivity4AppletDTO.setGroupPic(groupQrcodeInfo.getQrcodeUrl());
-                groupActivity4AppletDTO.setUserNumber(groupQrcodeInfo.getUserNumber());
-                //头像列表从缓存里取
-                List<String> headUrlList = appletGroupSearchRecordBiz
-                        .getHeadUrlList(groupActivity4AppletDTO.getUserNumber(), groupActivity4AppletDTO.getBookGroupQrcodeId());
-                groupActivity4AppletDTO.setHeadUrlList(headUrlList);
-                List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz
-                        .getStatementList(groupActivity4AppletDTO.getUserNumber(), headUrlList,
-                                groupActivity4AppletDTO.getBookGroupQrcodeId());
-                groupActivity4AppletDTO.setStatementDTOList(statementDTOS);
+                if (!StringUtil.isEmpty(groupQrCode)){ //2020/06/30 add by pansy 第三方群为空
+                    ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, classifyId);
+                    groupActivity4AppletDTO.setBookGroupQrcodeId(groupQrcodeInfo.getId());
+                    groupActivity4AppletDTO.setGroupName(groupQrcodeInfo.getGroupName());
+                    groupActivity4AppletDTO.setGroupPic(groupQrcodeInfo.getQrcodeUrl());
+                    groupActivity4AppletDTO.setUserNumber(groupQrcodeInfo.getUserNumber());
+
+                    //头像列表从缓存里取
+                    List<String> headUrlList = appletGroupSearchRecordBiz
+                            .getHeadUrlList(groupActivity4AppletDTO.getUserNumber(), groupActivity4AppletDTO.getBookGroupQrcodeId());
+
+                    groupActivity4AppletDTO.setHeadUrlList(headUrlList);
+
+                    List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz
+                            .getStatementList(groupActivity4AppletDTO.getUserNumber(), headUrlList,
+                                    groupActivity4AppletDTO.getBookGroupQrcodeId());
+                    groupActivity4AppletDTO.setStatementDTOList(statementDTOS);
+                }
             }
         }
     }