diff --git a/src/equipment_master/__pycache__/service.cpython-311.pyc b/src/equipment_master/__pycache__/service.cpython-311.pyc index cba13a1..06aa100 100644 Binary files a/src/equipment_master/__pycache__/service.cpython-311.pyc and b/src/equipment_master/__pycache__/service.cpython-311.pyc differ diff --git a/src/equipment_master/service.py b/src/equipment_master/service.py index 69a6864..17ccf10 100644 --- a/src/equipment_master/service.py +++ b/src/equipment_master/service.py @@ -30,10 +30,13 @@ async def get_all_master( if search: query = query.filter( - (EquipmentMaster.name.ilike(f"%{search}%")) | - (EquipmentMaster.assetnum.ilike(f"%{search}%")) + (EquipmentMaster.name.ilike(f"%{search}%")) + | (EquipmentMaster.assetnum.ilike(f"%{search}%")) ) + if not parent_id: + query = query.filter(EquipmentMaster.parent_id.is_(None)) + query = query.options(recursive_load(5)) common["items_per_page"] = items_per_page