Merge branch 'bug/102930zy' into 'master'

bug: [none] 接口500

See merge request rays/pcloud-book!1328

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

@@ -1244,7 +1244,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 			//之前小睿的码。现在叫rays码
 			List<Long> ruiList = qrcodeSceneDtos.stream().filter(a->null!=a.getQrcodeType() && ("ali".equalsIgnoreCase(a.getQrcodeType()) || "own".equalsIgnoreCase(a.getQrcodeType()))).map(x -> x.getSceneId()).collect(Collectors.toList());
 			//小睿的资源数量。要在resource_page_item查
-			Map<Long, BookGroupServeCountDTO> ruiMap=resourcePageItemDao.mapQrServeCount(ruiList);
+			Map<Long, BookGroupServeCountDTO> ruiMap=CollUtil.isNotEmpty(ruiList) ? resourcePageItemDao.mapQrServeCount(ruiList) : new HashMap<>();
 			// 企业微信群资源数
 			Map<Long, BookGroupServeCountDTO> bookQrcodeWxworkMap = bookQrcodeWxworkBiz.mapWxWorkServeCount4SceneIds(sceneIds, BookQrcodeType.OFFICIAL_ACCOUNTS.getCode());
 			//计算码的销售额

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

@@ -4259,9 +4259,9 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 for (RightsNowItem rightsNowItem : itemList) {
                     String typeCode = rightsNowItem.getServeTypeCode();
                     //视频课直播课
-                    if (typeCode.equals(AppTypeEnum.VIDEO.value) || typeCode.equals(ProductTypeConstant.VIDEO)
+                    if (null!=typeCode && (typeCode.equals(AppTypeEnum.VIDEO.value) || typeCode.equals(ProductTypeConstant.VIDEO)
                             || typeCode.equals(ProductTypeConstant.VIDEO_SCHEDULE) || typeCode.equals(AppTypeEnum.LIVE_TIMETABLE.value)
-                            || typeCode.equals(ProductTypeConstant.LIVE) || typeCode.equals(ProductTypeConstant.SCHEDULE)) {
+                            || typeCode.equals(ProductTypeConstant.LIVE) || typeCode.equals(ProductTypeConstant.SCHEDULE))) {
                         courseList.add(rightsNowItem);
                     }
                 }