Merge branch '1064714_FixPersonIndexQuery' into '2020.2.0'

1064714 fix person index query

See merge request xrm/basic!365

entity/Person_entity/recordcontainers/index/query.js

@@ -49,9 +49,11 @@ var querySelect = newSelect([
     .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
         .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone")
     .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
-                    .orderBy("CONTACT.CONTACTID");
+
 
 if (vars.exists("$local.idvalue"))
-    querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue");
+    querySelect.andIfSet("CONTACT.CONTACTID", "$local.idvalue");
+
+querySelect = querySelect.orderBy("CONTACT.CONTACTID");
 
 result.string(querySelect);
\ No newline at end of file