动态字段调整排序逻辑

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java

@@ -118,6 +118,8 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
             List<Long> datasetIdList = customResult.getList().stream().map(item -> item.getDatasetId()).collect(Collectors.toList());
             if (!ObjectUtils.isEmpty(datasetIdList)) {
                 query.setIdList(datasetIdList);
+                //query.setOrderColList();
+
             } else {
                 query.setIdList(ListUtil.toList(0L));
             }

base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapper.xml

@@ -376,14 +376,56 @@
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('appIdList') and conditionParamRef.appIdList.size() > 0">
+                field(a.appId,
+                <foreach collection="conditionParamRef.appIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                field(a.updateUserId,
+                <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                    ${item.colName} ${item.sortKind}
+                    a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('appIdList') and conditionParamRef.appIdList.size() > 0">
+                field(a.appId,
+                <foreach collection="conditionParamRef.appIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                field(a.updateUserId,
+                <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -412,6 +454,8 @@
                 </if>
             </trim>
         </if>
+
+
     </sql>
     <sql id="_group_by_">
         <if test="groupList != null and !groupList.isEmpty()">

base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http

@@ -21,7 +21,7 @@ Content-Type: application/json
   "page": 1,
   "size": 10,
   "appId": 226,
-  "fieldCode": "name",
+  "fieldCode": "top",
   "fieldValue": "%%"
 }