Merge branch 'fixbug/mapResourceTotalCount' into 'master'

bug: [none] 解决导出问题

See merge request rays/pcloud-book!1205

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

@@ -1152,9 +1152,11 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 		} catch (InterruptedException | ExecutionException | TimeoutException e) {
 			LOGGER.error("获取二维码信息错误: {}==", e);
 		}
+		if(CollUtil.isNotEmpty(mapQrcodeMessage)){
 			// 只查询公众号二维码中未被删除的sceneId对应的企业微信资源数
 			String strSceneIds = mapQrcodeMessage.values().stream().map(x -> x.getSceneIdStr()).collect(Collectors.joining(","));
 			mapWxworkServeCount = bookQrcodeWxworkBiz.mapWxWorkServeCount4BookIds(adviserIds, bookIds, channelIds, strSceneIds);
+		}
 		try {
 			mapBookGroupServeCount = mapBookGroupServeCountSubmit.get();
 		}catch (InterruptedException | ExecutionException e) {

pcloud-service-book/src/main/resources/mapper/book/BookQrcodeWxworkDao.xml

@@ -125,7 +125,7 @@
         SELECT
             CONCAT(book_id,'_',channel_id,'_',adviser_id) bookChannelAdviserId, book_qrcode_id bookQrcodeId,COUNT(id) serveCount,
             book_id bookId, adviser_id adviserId, channel_id channelId, COUNT(DISTINCT book_qrcode_id) qrcodeCount,
-            GROUP_CONCAT(book_qrcode_id) sceneIdStr
+            GROUP_CONCAT(DISTINCT book_qrcode_id) sceneIdStr
         FROM
             book_qrcode_wxwork
         WHERE