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;