backend/users/models.py

@@ -127,6 +127,7 @@ class Users(SQLModel, table=True):
                 Roles.role_name == role_name,
                 cls.is_deleted == False,  # noqa: E712
             )
+            .order_by(cls.created_at.desc(), cls.id.desc())
         )
         uid = cls._as_uuid(user_id) if user_id is not None else None
         if uid is not None:
@@ -232,7 +233,7 @@ class Users(SQLModel, table=True):
                 cls.is_approved == False,  # noqa: E712
                 cls.role_id != 8,
             )
-            .order_by(cls.created_at.desc())
+            .order_by(cls.created_at.desc(), cls.id.desc())
         )
         result = await session.execute(statement)
         return result.scalars().all()