Could you provide us with your save-file? Maybe something you did during the riot prevents the prisoners from going back to their cells (locking doors, setting areas to staff only etc.). Have you tried to manually assign a prisoner to a cell by right-clicking on an empty cell with the prisoner selec...