From 72d759964d8b764eafce0a3cbabc3cef7c247d46 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Mon, 6 Jul 2026 22:33:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20use=5Fstatus=3D0=20=E8=A2=AB=20||=20?= =?UTF-8?q?=E8=B7=B3=E8=BF=87=E5=AF=BC=E8=87=B4=E7=AD=9B=E9=80=89=E5=92=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E5=A4=B1=E6=95=88=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E7=94=A8=20!=3D=3D=20undefined=20=E6=98=BE=E5=BC=8F?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= 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 a2d326e..4c796ea 100644 --- a/app/service/systems/setting/store_warehouse.js +++ b/app/service/systems/setting/store_warehouse.js @@ -326,7 +326,9 @@ class SettingStoreWarehouseService extends Service { where.auth_status = authStatus; } - const useStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status || data.store_use_status, 'use_status', null); + const rawUseStatus = data.use_status !== undefined ? data.use_status + : (data.warehouse_use_status !== undefined ? data.warehouse_use_status : data.store_use_status); + const useStatus = this.normalizeStatusFlag(rawUseStatus, 'use_status', null); if (useStatus !== null) { if (currentSubject.isWarehouse) { where.warehouse_use_status = useStatus; @@ -691,7 +693,9 @@ class SettingStoreWarehouseService extends Service { try { const currentSubject = await this.getCurrentSubject(); const relation = await this.findScopedRelation(data, currentSubject, transaction); - const nextUseStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status, 'warehouse_use_status', 0); + const nextUseStatus = this.normalizeStatusFlag( + data.use_status !== undefined ? data.use_status : data.warehouse_use_status, + 'warehouse_use_status', 0); const patch = currentSubject.isWarehouse ? { warehouse_use_status: nextUseStatus } : { store_use_status: nextUseStatus }; diff --git a/app/service/systems/store_warehouse.js b/app/service/systems/store_warehouse.js index f7962c4..b40f8cc 100644 --- a/app/service/systems/store_warehouse.js +++ b/app/service/systems/store_warehouse.js @@ -923,7 +923,9 @@ class SettingStoreWarehouseService extends Service { where.auth_status = authStatus; } - const useStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status || data.store_use_status, 'use_status', null); + const rawUseStatus = data.use_status !== undefined ? data.use_status + : (data.warehouse_use_status !== undefined ? data.warehouse_use_status : data.store_use_status); + const useStatus = this.normalizeStatusFlag(rawUseStatus, 'use_status', null); if (useStatus !== null) { if (currentSubject.isWarehouse) { where.warehouse_use_status = useStatus; @@ -2404,7 +2406,9 @@ class SettingStoreWarehouseService extends Service { try { const currentSubject = await this.getCurrentSubject(); const relation = await this.findScopedRelation(data, currentSubject, transaction); - const nextUseStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status, 'warehouse_use_status', 0); + const nextUseStatus = this.normalizeStatusFlag( + data.use_status !== undefined ? data.use_status : data.warehouse_use_status, + 'warehouse_use_status', 0); const patch = currentSubject.isWarehouse ? { warehouse_use_status: nextUseStatus } : { store_use_status: nextUseStatus };