fix: recursive function of equipment master rendering children without parent

10 months ago · 2014146692
parent 333cf1d68b
commit 2014146692
2 changed files with 5 additions and 2 deletions
--- a/src/equipment_master/pycache/service.cpython-311.pyc
+++ b/src/equipment_master/pycache/service.cpython-311.pyc
--- 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