From f1aa79980926330a86f35f1c7fae9314c44ce420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Mon, 13 Jul 2026 11:36:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=BF=87=E6=BB=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/thirdparty/MdmMerchantSyncFilter.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/thirdparty/MdmMerchantSyncFilter.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/thirdparty/MdmMerchantSyncFilter.java index c5ed5f366..63e9ec2eb 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/thirdparty/MdmMerchantSyncFilter.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/thirdparty/MdmMerchantSyncFilter.java @@ -95,21 +95,12 @@ public final class MdmMerchantSyncFilter { public static SkipReason resolveSkipReason(MdmMerchantRecordDTO record, String orgNcCode, Long syncOrganizationId, Long topOrganizationId) { - if (record == null || StringUtils.isEmpty(record.getCode())) { + if (StringUtils.isEmpty(trim(record.getDesc17()))) { return SkipReason.EMPTY_CODE; } - if (!isCustomer(record)) { - return SkipReason.NOT_CUSTOMER; - } - if (!belongsToOrg(record.getDesc24(), orgNcCode, syncOrganizationId, topOrganizationId)) { - return SkipReason.ORG_MISMATCH; - } if (StringUtils.isEmpty(trim(record.getDesc1()))) { return SkipReason.MISSING_NAME; } - if (isDisabled(record)) { - return SkipReason.DISABLED; - } return null; }