fix #12480 and make code less nested

The old code logic was wrong:

    if chunk['__id__'] == req_val:
        if chunk['state'] == req_key:
            ...
    elif req_key == 'sls':

Then if a state require: ``sls: redis``

req_val = 'redis', req_key = 'sls', if req_val matches chunk['__id__'],
code flow would never go into ``elif`` clause. That make salt sometimes
miss to check req_key == 'sls' case.