LPS-45936 Logic of CompanyThreadLocal.setCompanyId needs to know the company we are currently using
LPS-45936 Simplify
LPS-45936 Update order