This full 7 round mock (post Diggs trade) has the Bills trading up with the Bengals to 18 and Drafting Brian Thomas.
I find it highly unlikely the Bengals trade this pick with Thomas still on the board.
https://www.profootballnetwork.com/o...draft-april-3/