diff --git a/core/src/database/query/session.rs b/core/src/database/query/session.rs index 0361997..6a1eb14 100644 --- a/core/src/database/query/session.rs +++ b/core/src/database/query/session.rs @@ -18,9 +18,13 @@ impl Query { user_id: Option, admin_id: Option, ) -> Result, DbErr> { - Session::find() - .filter(session::Column::UserId.eq(user_id)) - .filter(session::Column::AdminId.eq(admin_id)) + if user_id.is_some() { + Session::find() + .filter(session::Column::UserId.eq(user_id)) + } else { + Session::find() + .filter(session::Column::AdminId.eq(admin_id)) + } .all(db) .await }