If your previous status was not on h1b, and form I-797 is above I-94, then you will get approval for both H1b as well as Change of status request.
Your employer may not be able to tell, howevevr, your employer's attorney should be able to answer all of your questions.