Cizz22 1 year ago
parent 9c81168647
commit 5eb1259092

@ -143,6 +143,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): 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) scope = await get_scope_by_name_service(db_session=db_session, scope_name=exclude)
query = Select(MasterEquipment).filter(MasterEquipment.assetnum != None) query = Select(MasterEquipment).filter(MasterEquipment.assetnum != None)
query = query.outerjoin( query = query.outerjoin(
@ -150,7 +151,7 @@ async def get_all_master_equipment(*, db_session: DbSession, exclude: Optional[s
if scope: if scope:
query = query.filter( query = query.filter(
not_(ScopeEquipment.scope_id).is_(scope.id) | ( not_(ScopeEquipment.scope_id == scope.id) | (
ScopeEquipment.scope_id.is_(None)) ScopeEquipment.scope_id.is_(None))
) )
else: else:

Loading…
Cancel
Save