From 2ff17a54dcedda10b6a3662d05e7a806c1c7966f Mon Sep 17 00:00:00 2001 From: liufumingren Date: Mon, 6 Jul 2026 22:26:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20buildListWhere=20=E8=B4=A7=E4=B8=BB?= =?UTF-8?q?=E4=BE=A7=E6=9F=A5=E8=AF=A2=E6=8C=89=20store=5Fuse=5Fstatus=20?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=EF=BC=8C=E4=BB=93=E5=BA=93=E4=BE=A7=E6=8C=89?= =?UTF-8?q?=20warehouse=5Fuse=5Fstatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/systems/setting/store_warehouse.js | 8 ++++++-- app/service/systems/store_warehouse.js | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/service/systems/setting/store_warehouse.js b/app/service/systems/setting/store_warehouse.js index a01cbf4..a2d326e 100644 --- a/app/service/systems/setting/store_warehouse.js +++ b/app/service/systems/setting/store_warehouse.js @@ -326,9 +326,13 @@ class SettingStoreWarehouseService extends Service { where.auth_status = authStatus; } - const useStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status, 'warehouse_use_status', null); + const useStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status || data.store_use_status, 'use_status', null); if (useStatus !== null) { - where.warehouse_use_status = useStatus; + if (currentSubject.isWarehouse) { + where.warehouse_use_status = useStatus; + } else { + where.store_use_status = useStatus; + } } return where; diff --git a/app/service/systems/store_warehouse.js b/app/service/systems/store_warehouse.js index 3f7b297..f7962c4 100644 --- a/app/service/systems/store_warehouse.js +++ b/app/service/systems/store_warehouse.js @@ -923,9 +923,13 @@ class SettingStoreWarehouseService extends Service { where.auth_status = authStatus; } - const useStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status, 'warehouse_use_status', null); + const useStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status || data.store_use_status, 'use_status', null); if (useStatus !== null) { - where.warehouse_use_status = useStatus; + if (currentSubject.isWarehouse) { + where.warehouse_use_status = useStatus; + } else { + where.store_use_status = useStatus; + } } return where;