Merge remote-tracking branch 'origin/master'

jiangping

2024-07-30 c0cb31a27522f2b480d7f98784eef37c2fb75f2d

 server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java

@@ -210,6 +210,7 @@
                        || response.getData() ==null
                        || response.getData().size() ==0){
                    hasMore = false;
                }else{
                    allList.addAll(response.getData());
                    currentNum += response.getTotal();
                }
@@ -224,6 +225,9 @@
    }

    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){
@@ -256,6 +260,7 @@
            model.setZtStatus(Constants.ONE);
            model.setZtInfo("crm同步");
            model.setIamUserId(data.getUserId());
            model.setMemberId(member==null?null:member.getId());
            model.setUserId(user== null?null:user.getId());
            model.setCreationDate(data.getCreationDate());
            addList.add(model);