From 44c851ce119e802698fc8f26c6b14853569cb3f4 Mon Sep 17 00:00:00 2001 From: Kris <2893855659@qq.com> Date: Sat, 11 Oct 2025 15:28:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=20=E5=89=94=E9=99=A4?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A0=A1=E9=AA=8C=E5=A4=9A=E6=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 59c4710f2e57b559aceb960de32021c600280c43) --- .../service/impl/DataVerifyServiceImpl.java | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java index 03878d2..41e9cf5 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java @@ -612,7 +612,7 @@ public class DataVerifyServiceImpl implements DataVerifyService { hasError = processDataBatch(batch, objectApi, fields, excelWriter, objectWriter, summarySheet, detailSheet, sourceConn, targetConn, fieldMap) || hasError; } }catch (Exception e){ - log.error("API={},处理异常:{}",objectApi, e.getMessage()); + log.error("API={},处理异常:{}",objectApi, e.getMessage(),e); } if (sendEmail && hasError){ @@ -849,11 +849,16 @@ public class DataVerifyServiceImpl implements DataVerifyService { continue; } + //判断reference_to内是否包含User字符串 + String referenceTo = field.getReferenceTo(); + if (field.getReferenceTo().contains(",User") || field.getReferenceTo().contains("User,")) { + referenceTo = "User"; + } + if (field.getSfType().equals("reference") && !field.getReferenceTo().equals("data_picklist")) { - //判断reference_to内是否包含User字符串 - String referenceTo = field.getReferenceTo(); - if (field.getReferenceTo().contains(",User") || field.getReferenceTo().contains("User,")) { - referenceTo = "User"; + + if (field.getReferenceTo().length() > 1 && !"User".equals(referenceTo)){ + continue; } if (StringUtils.isBlank(referenceTo)){ continue; @@ -1290,11 +1295,16 @@ private void sendIncrementalQualityCheckEmail(DataVerifyParam param, String file continue; } + //判断reference_to内是否包含User字符串 + String referenceTo = field.getReferenceTo(); + if (field.getReferenceTo().contains(",User") || field.getReferenceTo().contains("User,")) { + referenceTo = "User"; + } + if (field.getSfType().equals("reference") && !field.getReferenceTo().equals("data_picklist")) { - //判断reference_to内是否包含User字符串 - String referenceTo = field.getReferenceTo(); - if (field.getReferenceTo().contains(",User") || field.getReferenceTo().contains("User,")) { - referenceTo = "User"; + + if (field.getReferenceTo().length() > 1 && !"User".equals(referenceTo)){ + continue; } if (StringUtils.isBlank(referenceTo)){ continue;