Merge branch 'master' of ssh://begitlab.chubanyun.me:12122/rays/pcloud-book

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

@@ -105,8 +105,8 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
         map.put("wechatUserId", wechatUserId);
         PageBeanNew<AppletUserBookcaseDTO> pageBeanNew = appletUserBookcaseDao.listPageNew(
                 new PageParam(currentPage, numPerPage), map, "listByWechatUserId");
-        if (null == pageBeanNew || ListUtils.isEmpty(pageBeanNew.getRecordList())) {
-            return new PageBeanNew<>(currentPage, numPerPage, 0, new ArrayList<>());
+        if (ListUtils.isEmpty(pageBeanNew.getRecordList())) {
+            return new PageBeanNew<>(currentPage, numPerPage, pageBeanNew.getTotalCount(), new ArrayList<>());
         }
         fillTempletName(pageBeanNew.getRecordList());
         fillRightsSettingAndResourceCount(pageBeanNew.getRecordList());

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

@@ -1041,8 +1041,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);
             // 处理权益中的应用/作品
@@ -1061,7 +1062,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);
@@ -1822,8 +1822,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);
             // 处理权益中的应用/作品
@@ -1838,7 +1840,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);