diff --git a/bms-back/bms-system/src/main/java/com/bms/price/oracle/CustomerKeywordResolver.java b/bms-back/bms-system/src/main/java/com/bms/price/oracle/CustomerKeywordResolver.java index cdbe1e2b..243f7a3b 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/oracle/CustomerKeywordResolver.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/oracle/CustomerKeywordResolver.java @@ -61,6 +61,14 @@ public class CustomerKeywordResolver } } } + // Pass-through raw keywords (covers codes not yet in ctr_customer) + for (String kw : keywords) + { + if (StringUtils.isNotEmpty(kw)) + { + codes.add(kw.trim()); + } + } query.setCustomerCodes(codes.isEmpty() ? null : new ArrayList(codes)); // 名称已全部解析为代码;Oracle 侧不保留跨列 OR 条件 query.setCustomerKeywords(null); diff --git a/bms-back/bms-system/src/main/resources/mapper/price/CustomerCodeResolveMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/CustomerCodeResolveMapper.xml index 4b8ebed9..2cacd799 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/CustomerCodeResolveMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/CustomerCodeResolveMapper.xml @@ -4,14 +4,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/bms-front/src/views/monitor/orderSource/index.vue b/bms-front/src/views/monitor/orderSource/index.vue index 7420be00..6f8d8253 100644 --- a/bms-front/src/views/monitor/orderSource/index.vue +++ b/bms-front/src/views/monitor/orderSource/index.vue @@ -136,7 +136,7 @@ const searchColumns = [ label: '客户', prop: 'customerKeywords', component: 'textarea', - placeholder: '客户名称/客户代码,一行一个', + placeholder: '客户名称/客户编码/对外代码,一行一个', props: { rows: 2, autosize: { minRows: 1, maxRows: 4 },