fix(stockTransaction): keyword 无匹配商品时条件置空防全表查询流水,货主模式列表补充 mode=store 入参

This commit is contained in:
liufumingren 2026-09-03 17:03:56 +08:00
parent 4259628396
commit 6354a6d8dc
2 changed files with 19 additions and 0 deletions

View File

@ -166,6 +166,7 @@ class StockTransactionMethodService extends MainService {
orderId,
sort: sortOption,
pagination,
mode: 'store',
});
return this.success('ok', result);

View File

@ -433,18 +433,27 @@ class StockTransactionService extends Service {
? rawStockIds.map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)
: [];
const normalizedKeyword = String(keyword || '').trim();
let keywordResolvedEmpty = false;
if (normalizedKeyword && resolvedStockIds.length === 0) {
const isStoreMode = mode === 'store';
const primaryDimCol = isStoreMode ? 'store_id' : 'warehouse_id';
const primaryDimVal = isStoreMode ? Number(storeId) : Number(warehouseId);
if (primaryDimVal > 0) {
resolvedStockIds = await this._resolveKeywordToStockIds(normalizedKeyword, primaryDimCol, primaryDimVal);
if (resolvedStockIds.length === 0) {
// keyword 无匹配商品,避免退化为查询全部流水
keywordResolvedEmpty = true;
}
}
}
const whereClauses = [];
const replacements = {};
if (keywordResolvedEmpty) {
whereClauses.push('1 = 0');
}
// 数据范围限定:仓库侧或货主侧
if (warehouseId !== undefined && warehouseId !== null) {
whereClauses.push('t.warehouse_id = :warehouseId');
@ -686,12 +695,17 @@ class StockTransactionService extends Service {
? rawStockIds.map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)
: [];
const normalizedKeyword = String(keyword || '').trim();
let keywordResolvedEmpty = false;
if (normalizedKeyword && resolvedStockIds.length === 0) {
const isStoreMode = mode === 'store';
const primaryDimCol = isStoreMode ? 'store_id' : 'warehouse_id';
const primaryDimVal = isStoreMode ? Number(storeId) : Number(warehouseId);
if (primaryDimVal > 0) {
resolvedStockIds = await this._resolveKeywordToStockIds(normalizedKeyword, primaryDimCol, primaryDimVal);
if (resolvedStockIds.length === 0) {
// keyword 无匹配商品,避免退化为导出全部流水
keywordResolvedEmpty = true;
}
}
}
@ -699,6 +713,10 @@ class StockTransactionService extends Service {
const whereClauses = [];
const replacements = {};
if (keywordResolvedEmpty) {
whereClauses.push('1 = 0');
}
// 数据范围限定
if (warehouseId !== undefined && warehouseId !== null) {
whereClauses.push('t.warehouse_id = :warehouseId');