From 9f9b0867ac78709a1eeea3fdb9da61a5915f585c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Sat, 11 Jul 2026 16:49:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E5=95=86BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/thirdparty/MdmMerchantSyncFilter.java    | 2 +-
 .../user/application/service/UserShipperApplicationService.java | 2 +-
 2 files changed, 2 insertions(+), 2 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 e6b62e6b5..c5ed5f366 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
@@ -101,7 +101,7 @@ public final class MdmMerchantSyncFilter {
         if (!isCustomer(record)) {
             return SkipReason.NOT_CUSTOMER;
         }
-        if (StringUtils.isNotEmpty(orgNcCode) && !orgNcCode.equals(trim(record.getCode()))) {
+        if (!belongsToOrg(record.getDesc24(), orgNcCode, syncOrganizationId, topOrganizationId)) {
             return SkipReason.ORG_MISMATCH;
         }
         if (StringUtils.isEmpty(trim(record.getDesc1()))) {
diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
index f41797c4e..f70783dd3 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
@@ -1589,7 +1589,7 @@ public class UserShipperApplicationService {
                                                         Long targetOrganizationId, String targetOrganizationName,
                                                         Long targetTopOrganizationId) {
         UserShipperDO userShipperDO = new UserShipperDO();
-        userShipperDO.setCustomerNcCode(record.getCode());
+        userShipperDO.setCustomerNcCode(record.getDesc17());  // NC编码用desc17，与匹配Key一致
         userShipperDO.setUserMemberCode(record.getCode());
         userShipperDO.setShipperEnterpriseName(record.getDesc1());
         userShipperDO.setUserNameShipper(record.getDesc1());