From 715a2691d88ffbe5f5be9e5403c166f923088fcc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 26 七月 2024 17:15:57 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
index 00d2f47..d24c684 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
@@ -200,28 +200,34 @@
         boolean hasMore = true;
         int currentNum = 0;
         Date cdate = new Date();
+        List<CRMDaogouBindListResponse> allList = new ArrayList<>();
         while (hasMore){
             try {
                 request.setPage(request.getPage()+1);
-                currentNum += currentNum;
                 CRMBaseResponse<List<CRMDaogouBindListResponse>> response = zbomCRMService.getDaogouBindList(request);
                 if(response==null
                         || !StringUtils.equals(response.getCode(), CRMConstants.CODE_SUCCESS)
                         || response.getData() ==null
                         || response.getData().size() ==0){
                     hasMore = false;
+                }else{
+                    allList.addAll(response.getData());
+                    currentNum += response.getTotal();
                 }
                 if(currentNum >= response.getTotal()){
                     hasMore = false;
                 }
-                dealSyncDataBiz(cdate,response.getData());
             }catch (Exception e){
                 hasMore = false;
             }
         }
+        dealSyncDataBiz(cdate,allList);
     }
 
     private void dealSyncDataBiz(Date date,List<CRMDaogouBindListResponse> list) {
+        if(list ==null && list.size()==0){
+            return;
+        }
         List<CustomerUser> addList = new ArrayList<>();
         List<String> phoneList = new ArrayList<>();
         for(CRMDaogouBindListResponse data : list){

--
Gitblit v1.9.3