Merge branch 'fixbug/none' into 'master'

bug:[none] 配置数据为空时拼群失败

See merge request rays/pcloud-book!831

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

@@ -1027,8 +1027,9 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         if (null == rightsSettingTitle || null == rightsSettingTitle.getRightsSettingId()) {
             return;
         }
+        Integer collage = 1;
         List<RightsNowItem> items = Lists.newArrayList();
-        if (CollectionUtils.isEmpty(nowItems)) {
+        if (CollectionUtils.isEmpty(nowItems) && rightsSettingTitle.getCollageState().intValue() == collage.intValue()) {
             // 填充咨询
             supplementNews(rightsSettingId, wechatUserId, rightsClassifyId, top, items,bookId, itemType.value);
             // 处理权益中的应用/作品
@@ -1047,7 +1048,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         }
         // 此处只有资讯才会补充资讯
         if (RightsServeTypeEnum.NEWS.name().equalsIgnoreCase(rightsSettingTitle.getServeType())){
-            Integer collage = 1;
             if (items.size() < top &&  rightsSettingTitle.getCollageState().intValue() == collage.intValue()){
                 // 填充咨询
                 supplementNews(rightsSettingId, wechatUserId, rightsClassifyId, top - items.size(), items, bookId, itemType.value);
@@ -1808,8 +1808,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
             return;
         }
 
+        Integer collage = 1;  //状态为拼群
         List<RightsNowItem> items = Lists.newArrayList();
-        if (CollectionUtils.isEmpty(nowItems)) {
+
+        if (CollectionUtils.isEmpty(nowItems) && rightsSettingTitle.getCollageState().intValue() == collage.intValue()) {
             // 填充群
             supplementGroup(rightsSettingId, wechatUserId, rightsClassifyId, top, items,bookId,null);
             // 处理权益中的应用/作品
@@ -1824,7 +1826,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 items.add(nowItem);
             }
         }
-        Integer collage = 1;  //状态为拼群
+
         if (items.size() < top && rightsSettingTitle.getCollageState().intValue() == collage.intValue()) {
             // 填充咨询
             supplementGroup(rightsSettingId, wechatUserId, rightsClassifyId, top, items, bookId,null);