From ac3e118ab967885b5f2cefcfd3a32e9dea45fe07 Mon Sep 17 00:00:00 2001 From: ulleo Date: Tue, 11 Aug 2026 18:14:30 +0800 Subject: [PATCH] feat: switch search filters from OR to AND logic --- backend/apps/data_training/curd/data_training.py | 2 +- backend/apps/terminology/curd/terminology.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/apps/data_training/curd/data_training.py b/backend/apps/data_training/curd/data_training.py index 5507adef..8b77c3b5 100644 --- a/backend/apps/data_training/curd/data_training.py +++ b/backend/apps/data_training/curd/data_training.py @@ -55,7 +55,7 @@ def build_data_training_query(session: SessionDep, oid: int, name: Optional[str] if ds_filter_condition is not None and adv_filter_condition is not None: parent_ids_subquery = parent_ids_subquery.where( - or_(ds_filter_condition, adv_filter_condition) + and_(ds_filter_condition, adv_filter_condition) ) elif ds_filter_condition is not None: parent_ids_subquery = parent_ids_subquery.where(ds_filter_condition) diff --git a/backend/apps/terminology/curd/terminology.py b/backend/apps/terminology/curd/terminology.py index ee53c5c0..91012039 100644 --- a/backend/apps/terminology/curd/terminology.py +++ b/backend/apps/terminology/curd/terminology.py @@ -86,7 +86,7 @@ def build_terminology_query(session: SessionDep, oid: int, name: Optional[str] = if ds_filter_condition is not None and adv_filter_condition is not None: parent_ids_subquery = parent_ids_subquery.where( - or_(ds_filter_condition, adv_filter_condition) + and_(ds_filter_condition, adv_filter_condition) ) elif ds_filter_condition is not None: parent_ids_subquery = parent_ids_subquery.where(ds_filter_condition)