Revert "BRCD-3337: move aid query outside the condition."
Revert "BRCD-3337: move aid query outside the condition."

This reverts commit f1e29fe1f32dd4de3a6066fdaf05a775e40c96b1.

BillRun/system,BillRun/system,BillRun/system,BillRun/system