Merge branch 'fixbug/1028731' into 'master'

bug: [1028731] 【生产环境】【编辑端】【翻页】书籍下二维码点击第二页显示的还是第一页的数据

See merge request rays/pcloud-book!1259

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

@@ -81,7 +81,6 @@ import com.pcloud.book.group.dto.BookServeLabelDTO;
 import com.pcloud.book.group.entity.BookGroupServe;
 import com.pcloud.book.group.enums.AppAndProductTypeEnum;
 import com.pcloud.book.group.enums.JoinGroupTypeEnum;
-import com.pcloud.book.group.tools.SendWeixinRequestTools;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.rightsSetting.constants.RightsSettingConstant;
 import com.pcloud.book.rightsSetting.dao.RightsSettingDAO;
@@ -2834,7 +2833,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 			// 手动分页
 			List<BookQrcodeVO> pageList = CollUtil.page(currentPage, numPerPage, bookQrcodeList);
 
-			fillPageList(currentPage, numPerPage, pageList);
+			fillPageList(pageList);
 			return new PageBeanNew<>(currentPage, numPerPage, totalCount, pageList);
 		} catch (InterruptedException | ExecutionException e) {
 			LOGGER.warn("获取图书二维码，异步任务失败！", e);
@@ -2845,10 +2844,12 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 	/**
 	 * 填充手动分页结果
 	 */
-	private void fillPageList(Integer currentPage, Integer numPerPage, List<BookQrcodeVO> pageList) {
+	private void fillPageList(List<BookQrcodeVO> pageList) {
+
+		if (CollUtil.isEmpty(pageList)) return;
 
 		// 分组
-		Map<String, List<Long>> map = CollUtil.page(currentPage, numPerPage, pageList).stream().collect(
+		Map<String, List<Long>> map = pageList.stream().collect(
 				Collectors.groupingBy(BookQrcodeVO::getSource, Collectors.mapping(BookQrcodeVO::getSceneId, Collectors.toList())));
 
 		// 二维码标签 二维码印码位置 二维码类型 二维码ID 二维码地址 服务