From 3c98777e204f02cca50905aad42c6ee1a9c72aae Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 25 May 2023 20:57:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/service/sync/HeartService.java     | 3 +--
 .../glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java  | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

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<List<SupProductEntity>> splits = CustomUtil.splitList(supProductList, 100);
             if (CollUtil.isNotEmpty(splits)) {
                 for (List<SupProductEntity> 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<ThrProductsDao, ThrProdu
                         }
                     }
                 });
-
-
                 if (list.size() >= limit) {
                     page++;
                 } else {
@@ -245,7 +243,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                         }
                     }
                 });
-                if (list.size() >= limit) {
+                if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) {
                     page++;
                 } else {
                     break;