If I have full access to your database I would instead update my org-id and read data from other orgs.
I think the same HMAC(pepper, user, org) as a validation column would work. Better yet, encryption with AAD on any tenancy data if you have a TPM available.