From 610cea40feadf8527b4d2d1bddbdee493961ca4c Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 8 Nov 2022 23:26:11 +0800
Subject: [PATCH] -

---
 .../service/impl/DataSyncConfigServiceImpl.java      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
index e462eea806..60eb0b812f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
@@ -1196,10 +1196,12 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
         do {
             // 分页，一次查询1000居民，循环更新他们的核酸检测信息
             resis = getNatUserInfoFromDb(p, pageNo, pageSize);
-            yantaiHsjcByDbView(resis, jobEntity.getCustomerId(), NumConstant.ONE_STR);
-            pageNo++;
-            updatedResiCount += pageSize;
-            log.info("【任务处理器同步数据】组织Id:{},同步类型:{},已完成居民数:{}", jobEntity.getOrgId(), jobEntity.getJobType(), updatedResiCount);
-        } while (!org.springframework.util.CollectionUtils.isEmpty(resis));
+            if (CollectionUtils.isNotEmpty(resis)) {
+                yantaiHsjcByDbView(resis, jobEntity.getCustomerId(), NumConstant.ONE_STR);
+                pageNo++;
+                updatedResiCount += resis.size();
+                log.info("【任务处理器同步数据】组织Id:{},同步类型:{},已完成居民数:{}", jobEntity.getOrgId(), jobEntity.getJobType(), updatedResiCount);
+            }
+        } while (CollectionUtils.isNotEmpty(resis));
     }
 }