HPCC-12989 Sort queries by target cluster

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>

common/workunit/workunit.cpp

@@ -2363,7 +2363,7 @@ mapEnums querySortFields[] =
    { WUQSFwarnTimeLimitHi, "@warnTimeLimit" },
    { WUQSFpriority, "@priority" },
    { WUQSFpriorityHi, "@priority" },
-   { WUQSFQuerySet, "../@id" },
+   { WUQSFQuerySet, "@querySetId" },
    { WUQSFActivited, "@activated" },
    { WUQSFSuspendedByUser, "@suspended" },
    { WUQSFLibrary, "Library"},

esp/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -1296,6 +1296,8 @@ bool CWsWorkunitsEx::onWUListQueries(IEspContext &context, IEspWUListQueriesRequ
             sortOrder[0] = (WUQuerySortField) (WUQSFwarnTimeLimit | WUQSFnumeric);
         else if (strieq(sortBy, "Priority"))
             sortOrder[0] = (WUQuerySortField) (WUQSFpriority | WUQSFnumeric);
+        else if (strieq(sortBy, "QuerySetId"))
+            sortOrder[0] = WUQSFQuerySet;
         else
             sortOrder[0] = WUQSFId;