weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

客商BUG修复

Browse Source
This commit is contained in:
秦鸿展
2026-07-11 16:49:21 +08:00
parent 1a309cb042
commit 9f9b0867ac
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/thirdparty/MdmMerchantSyncFilter.java
Vendored
+1 -1
View File
@@ -101,7 +101,7 @@ public final class MdmMerchantSyncFilter {
if (!isCustomer(record)) { if (!isCustomer(record)) {
return SkipReason.NOT_CUSTOMER; return SkipReason.NOT_CUSTOMER;
} }
if (StringUtils.isNotEmpty(orgNcCode) && !orgNcCode.equals(trim(record.getCode()))) { if (!belongsToOrg(record.getDesc24(), orgNcCode, syncOrganizationId, topOrganizationId)) {
return SkipReason.ORG_MISMATCH; return SkipReason.ORG_MISMATCH;
} }
if (StringUtils.isEmpty(trim(record.getDesc1()))) { if (StringUtils.isEmpty(trim(record.getDesc1()))) {
mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
+1 -1
View File
@@ -1589,7 +1589,7 @@ public class UserShipperApplicationService {
Long targetOrganizationId, String targetOrganizationName, Long targetOrganizationId, String targetOrganizationName,
Long targetTopOrganizationId) { Long targetTopOrganizationId) {
UserShipperDO userShipperDO = new UserShipperDO(); UserShipperDO userShipperDO = new UserShipperDO();
userShipperDO.setCustomerNcCode(record.getCode()); userShipperDO.setCustomerNcCode(record.getDesc17()); // NC编码用desc17，与匹配Key一致
userShipperDO.setUserMemberCode(record.getCode()); userShipperDO.setUserMemberCode(record.getCode());
userShipperDO.setShipperEnterpriseName(record.getDesc1()); userShipperDO.setShipperEnterpriseName(record.getDesc1());
userShipperDO.setUserNameShipper(record.getDesc1()); userShipperDO.setUserNameShipper(record.getDesc1());