客商BUG修复

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()))) {

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());