Merge pull request #23166 from bhavesh95863/patch-8

fix: set company filter in condition