From b0f37d39360ddfb101fa682e7123cd98f77d9c3a Mon Sep 17 00:00:00 2001 From: Kris <2893855659@qq.com> Date: Wed, 16 Jul 2025 19:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=20=E4=BC=98=E5=8C=96User?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataImportServiceImpl.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportServiceImpl.java index b21f77f..89bee0d 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataImportServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataImportServiceImpl.java @@ -655,10 +655,9 @@ public class DataImportServiceImpl implements DataImportService { } else if (!DataUtil.isUpdate(field) || (dataField.getIsCreateable() != null && !dataField.getIsCreateable())) { continue; } else if (StringUtils.isNotBlank(reference_to) && !"data_picklist".equals(reference_to)) { - if (!"null".equals(map.get(field)) && null != map.get(field) && !"OwnerId".equals(field) - || !"Owner_Type".equals(field)) { + if (!"null".equals(map.get(field)) && null != map.get(field) ) { //判断reference_to内是否包含User字符串 - if (reference_to.contains("User")) { + if (reference_to.contains(",User") || reference_to.contains("User,")) { reference_to = "User"; } Map m = customMapper.getById("new_id", reference_to, String.valueOf(map.get(field))); @@ -670,16 +669,7 @@ public class DataImportServiceImpl implements DataImportService { if (map.get(field) != null && StringUtils.isNotBlank(dataField.getSfType())) { account.setField(field, DataUtil.localDataToSfData(dataField.getSfType(), String.valueOf(map.get(field)))); }else { - if (api.equals("Account")){ - if ("1".equals(map.get("IsPersonAccount")) && field.equals("Name")){ - continue; - }else if("0".equals(map.get("IsPersonAccount")) && field.equals("LastName")){ - continue; - } - - } else { - account.setField(field, map.get(field)); - } + account.setField(field, map.get(field)); } } } @@ -836,10 +826,9 @@ public class DataImportServiceImpl implements DataImportService { } else if (!DataUtil.isUpdate(field) || (dataField.getIsCreateable() != null && !dataField.getIsCreateable())) { continue; } else if (StringUtils.isNotBlank(reference_to) && !"data_picklist".equals(reference_to)) { - if (!"null".equals(map.get(field)) && null != map.get(field) && !"OwnerId".equals(field) - || !"Owner_Type".equals(field)) { + if (!"null".equals(map.get(field)) && null != map.get(field)) { //判断reference_to内是否包含User字符串 - if (reference_to.contains("User")) { + if (reference_to.contains(",User") || reference_to.contains("User,")) { reference_to = "User"; }