diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 1572fff76..4ceee7bf7 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1618,10 +1618,9 @@ public class HeartService { List> splits = CustomUtil.splitList(supProductList, 100); if (CollUtil.isNotEmpty(splits)) { for (List items : splits) { - supProductDao.replaceBatch(items); + supProductDao.insertOrUpdateBatch(items); } } - } if (CollUtil.isNotEmpty(syncFiles)) { // fileService.download(syncFiles); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index b486399d1..10a1a9429 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -199,8 +199,6 @@ public class ThrProductsServiceImpl extends ServiceImpl= limit) { page++; } else { @@ -245,7 +243,7 @@ public class ThrProductsServiceImpl extends ServiceImpl= limit) { + if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) { page++; } else { break;