Merge branch 'fixbug/fixnull' into 'master'

bug: [none] fixnull

See merge request rays/pcloud-book!867

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

@@ -1589,7 +1589,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         }
         RightsSettingDto dto = rightsSettingDAO.getByLabel(firstClassify, secondClassify, gradeLabelId, subjectLabelId, volLabelId, verLabelId);
         //有版本筛选但权益未配置
-        if (null == dto && verLabelId > 0) {
+        if (null == dto && null != verLabelId && verLabelId > 0) {
             Long commonLabelId = bookLabelDao.getByNameType("通用版",3);
             dto = rightsSettingDAO.getByLabel(firstClassify, secondClassify, gradeLabelId, subjectLabelId, volLabelId, commonLabelId);
         }