Merge branch 'fixbug/errornull' into 'master'

bug:[none]空指针异常

See merge request rays/pcloud-book!1418

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AnswerSubscribeBizImpl.java

@@ -303,7 +303,7 @@ public class AnswerSubscribeBizImpl implements AnswerSubscribeBiz {
         String openId = readerConsr.getOpenIdByWechatUserIdAndOfficialAccountsId(wechatUserId, accountSettingId);
         WechatUserOfficialAccounts accounts = readerConsr.getOfficialAccounts(accountSettingId, openId, wechatUserId);
         Boolean isSubscribe = false;
-        if (null != accounts) {
+        if (null != accounts && null != accounts.getIsSubscribe()) {
             isSubscribe = accounts.getIsSubscribe() == 1 ? true : false;
         }
         GroupQrcodeVO groupQrcodeVO = qrcodeSceneConsr.getSubscribeQrcode(accountSettingId);

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletRecordAggrStatisBizImpl.java

@@ -409,11 +409,15 @@ public class AppletRecordAggrStatisBizImpl implements AppletRecordAggrStatisBiz
             //年龄段下所有年级
             List<Long> gradeLabelIds = readerConsr.getUserGradeIdByParentId(parentLabel);
             //年级排序,当前年级在前
-            List<Long> orderFieldIds = new ArrayList<>(Arrays.asList(gradeLabelId));
-            if (!ListUtils.isEmpty(gradeLabelIds) && gradeLabelIds.contains(gradeLabelId)) {
+            List<Long> orderFieldIds = new ArrayList<>();
+            if (null != gradeLabelId) {
+                orderFieldIds.add(gradeLabelId);
+            }
+            if (!ListUtils.isEmpty(gradeLabelIds) && null != gradeLabelId && gradeLabelIds.contains(gradeLabelId)) {
                 gradeLabelIds.remove(gradeLabelId);
             }
             orderFieldIds.addAll(gradeLabelIds);
+
             countList = appletRecordSevenDayDao.getResourceByGrade4H5(sourceType, orderFieldIds, maxCount, sourceFrom);
         }
         if (ListUtils.isEmpty(countList)) {