From 0023249086581e8cacd4cc500bdf403e99546039 Mon Sep 17 00:00:00 2001 From: Kris <2893855659@qq.com> Date: Thu, 17 Jul 2025 17:19:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=88=A4=E6=96=ADUpdate=E6=97=B6=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/celnet/datadump/service/impl/CommonServiceImpl.java | 5 +++++ .../datadump/service/impl/DataImportBatchServiceImpl.java | 2 +- .../datadump/service/impl/DataImportNewServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java index 7b9970f..8ff0d19 100644 --- a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java @@ -1417,8 +1417,13 @@ public class CommonServiceImpl implements CommonService { if (dbNum >0 ) { int page = dbNum % 2000 == 0 ? dbNum / 2000 : (dbNum / 2000) + 1; + for (int i = 0; i < page; i++) { + + log.info("表api：{}，字段：{}，批次：{}，执行数据更新!", config.getApi(),config.getLinkField(), i); + List> mapList = customMapper.list("*", config.getApi(), "1=1 order by Id limit " + i * 2000 + ",2000"); + List> updateMapList = new ArrayList<>(); for (int j = 1; j <= mapList.size(); j++) { Map map = mapList.get(j - 1); diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java index cca72ec..3f707d1 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java @@ -744,7 +744,7 @@ public class DataImportBatchServiceImpl implements DataImportBatchService { continue; } else if ( "WhoId".equals(field) ||"WhatId".equals(field)){ continue; - } else if (StringUtils.isNotBlank(reference_to) && !"data_picklist".equals(reference_to)) { + } else if ("reference".equals(dataField.getSfType())) { if (!"null".equals(value) && StringUtils.isNotEmpty(value)) { //引用类型字段 diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java index c5a3f45..550db64 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java @@ -773,7 +773,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { account.setId(String.valueOf(map.get("new_id"))); } else if (!DataUtil.isUpdate(field) || (dataField.getIsCreateable() != null && !dataField.getIsCreateable())) { continue; - } else if (StringUtils.isNotBlank(reference_to) && !"data_picklist".equals(reference_to)) { + } else if ("reference".equals(dataField.getSfType())) { if (!"null".equals(value) && StringUtils.isNotEmpty(value)) { //引用类型字段