同步过滤逻辑修改1

This commit is contained in:
秦鸿展
2026-07-13 14:47:10 +08:00
parent f1aa799809
commit f1c7dd453b
2 changed files with 2 additions and 1 deletions
@@ -177,7 +177,7 @@ public class UserShipperMasterDataSyncService {
continue; continue;
} }
try { try {
String ncCode = trimToEmpty(record.getDesc17()); String ncCode = trimToEmpty(record.getCode());
String companyName = trimToEmpty(record.getDesc1()); String companyName = trimToEmpty(record.getDesc1());
String matchKey = UserShipperApplicationService.buildMasterDataMatchKey(ncCode, companyName); String matchKey = UserShipperApplicationService.buildMasterDataMatchKey(ncCode, companyName);
Long targetOrganizationId = MdmMerchantSyncFilter.resolveSaveOrganizationId(record, organizationId); Long targetOrganizationId = MdmMerchantSyncFilter.resolveSaveOrganizationId(record, organizationId);
@@ -210,6 +210,7 @@ public class MdmMasterDataApplicationService {
record.setDesc14(item.getString("DESC14")); record.setDesc14(item.getString("DESC14"));
record.setDesc15(item.getString("DESC15")); record.setDesc15(item.getString("DESC15"));
record.setDesc16(item.getString("DESC16")); record.setDesc16(item.getString("DESC16"));
record.setDesc17(item.getString("DESC17"));
record.setDesc23(item.getString("DESC23")); record.setDesc23(item.getString("DESC23"));
record.setDesc24(item.getString("DESC24")); record.setDesc24(item.getString("DESC24"));
record.setDesc25(item.getString("DESC25")); record.setDesc25(item.getString("DESC25"));