客商主数据同步修改

mhd_thrid_party/src/main/java/com/linke/thirdParty/application/server/MdmMasterDataApplicationService.java

@@ -60,11 +60,14 @@ public class MdmMasterDataApplicationService {
         String orgNcCode = queryDTO.getOrgNcCode().trim();
         int rawCount = result.getDataInfo().size();
         List<MdmMerchantRecordDTO> filtered = result.getDataInfo().stream()
-                .filter(record -> MdmMerchantSyncFilter.belongsToOrg(record.getDesc24(), orgNcCode))
+                .filter(record -> MdmMerchantSyncFilter.belongsToOrg(
+                        record.getDesc24(), orgNcCode,
+                        queryDTO.getSyncOrganizationId(), queryDTO.getTopOrganizationId()))
                 .collect(Collectors.toList());
         result.setDataInfo(filtered);
         if (rawCount != filtered.size()) {
-            String note = String.format("（MDM原始%d条，按DESC24=%s过滤后%d条；MDM总条数totalNumber为未过滤全库统计）",
+            String note = String.format(
+                    "（MDM原始%d条，按DESC24=%s或南光本组织空DESC24过滤后%d条；MDM总条数totalNumber为未过滤全库统计）",
                     rawCount, orgNcCode, filtered.size());
             result.setDesc(StringUtils.isEmpty(result.getDesc()) ? note : result.getDesc() + note);
             log.info("MDM客商查询应用侧过滤 orgNcCode={}, rawPageSize={}, filteredPageSize={}, mdmTotalNumber={}",