diff --git a/src/scope_equipment/service.py b/src/scope_equipment/service.py index ea0aa1d..fffd13f 100644 --- a/src/scope_equipment/service.py +++ b/src/scope_equipment/service.py @@ -142,6 +142,7 @@ async def get_exculed_scope_name(*, db_session: DbSession, scope_name: Union[str async def get_all_master_equipment(*, db_session: DbSession, exclude: Optional[str] = None, common: CommonParameters): scope = await get_scope_by_name_service(db_session=db_session, scope_name=exclude) + query = Select(MasterEquipment).filter(MasterEquipment.assetnum != None) @@ -150,7 +151,7 @@ async def get_all_master_equipment(*, db_session: DbSession, exclude: Optional[s if scope: query = query.filter( - not_(ScopeEquipment.scope_id).is_(scope.id) | ( + not_(ScopeEquipment.scope_id == scope.id) | ( ScopeEquipment.scope_id.is_(None)) ) else: