From b45316d33b3d27f7330609543175b5e981e88b4a Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 13 Oct 2022 14:50:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renren/modules/fuse/service/impl/TbFuseServiceImpl.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
index d7eac2bd..598b1272 100644
--- a/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
@@ -176,6 +176,9 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
                         Map<String, Object> dataResource = (Map<String, Object>) factory.get().getDataResource(dto);
                         if (!dataResource.isEmpty()) {
                             List<Map<String, Object>> list = (List<Map<String, Object>>) dataResource.get("data");
+                            if (list.size() < pageSize) {
+                                end.set(false);
+                            }
                             pageIndex.getAndIncrement();
                             return new HashMap() {{
                                 put(list.stream().map(map -> {
@@ -205,9 +208,11 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
                 Thread.sleep(300); // 防止任务运行过快，无法跳出循环
             } catch (InterruptedException e) {
                 logger.info("获取数据资源异常", e);
+                end.set(false);
             }
 
         } while (end.get());
+        CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[completableFutures.size()])).join();
         return result;
     }