ming #1

Merged
liufumingren merged 558 commits from ming into main 2026-11-18 16:13:25 +08:00
2 changed files with 12 additions and 4 deletions
Showing only changes of commit 2ff17a54dc - Show all commits

View File

@ -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;

View File

@ -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;