@Wai ***************
it comes down to the fact your employer said leave the country so they can apply for the work permit, then get the documentation to you so you can apply for the Non-B visa.
I think we've answered your question AND truth be told it's not really all that thai visa related ;)
Good Luck (y)