diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
index 6b9c9f3..4bd31c6 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
@@ -165,10 +165,11 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
                 .disableSubLogicDel();
         if (reqVO.getProcedureStatusList().size()==1 && reqVO.getProcedureStatusList().get(0)==2){
             //完工降序
-            query.orderByDesc(TaskDispatchDO::getCode);
+            query.orderByDesc(TaskDispatchDetailDO::getDispatchId,TaskDispatchDetailDO::getSort);
         }else {
             //未完工升序
-            query.orderByAsc(TaskDispatchDO::getCode);
+            query.orderByAsc(TaskDispatchDetailDO::getDispatchId,TaskDispatchDetailDO::getSort)
+            ;
         }
         if (CollUtil.isNotEmpty(postIds)) {
             query.and(i -> i
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
index 515fd27..b5a706b 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
@@ -342,33 +342,31 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
             postIds.add(fpUserDetailDO.getPostId());
         }
         PageResult<TaskDispatchDetailDO> taskDispatchDetailDOPageResult = taskDispatchDetailMapper.selectPageWx(pageReqVO, postIds);
-        List<TaskDispatchDetailDO> list = taskDispatchDetailDOPageResult.getList();
-        List<TaskDispatchDetailDO> afterList = new ArrayList<>();
-        if (CollUtil.isNotEmpty(list)){
-            Map<String, List<TaskDispatchDetailDO>> collect ;
-                    if(pageReqVO.getProcedureStatusList().size()==1 && pageReqVO.getProcedureStatusList().get(0)==2){
-                        collect = list.stream()
-                                .collect(Collectors.groupingBy(
-                                        TaskDispatchDetailDO::getDispatchCode,
-                                        () -> new TreeMap<>(Comparator.reverseOrder()),
-                                        Collectors.toList()
-                                ));
-
-                    }else {
-                        collect = list.stream()
-                                .collect(Collectors.groupingBy(
-                                        TaskDispatchDetailDO::getDispatchCode,
-                                        TreeMap::new,
-                                        Collectors.toList()
-                                ));
-                    }
-
-            collect.forEach((code,list2)->{
-                list2.sort(Comparator.comparing(TaskDispatchDetailDO::getSort, Comparator.nullsLast(Integer::compareTo)));
-                afterList.addAll(list2);
-            });
-        }
-        taskDispatchDetailDOPageResult.setList(afterList);
+//        List<TaskDispatchDetailDO> list = taskDispatchDetailDOPageResult.getList();
+//        List<TaskDispatchDetailDO> afterList = new ArrayList<>();
+//        if (CollUtil.isNotEmpty(list)){
+//            Map<String, List<TaskDispatchDetailDO>> collect ;
+//                    if(pageReqVO.getProcedureStatusList().size()==1 && pageReqVO.getProcedureStatusList().get(0)==2){
+//                        collect = list.stream()
+//                                .collect(Collectors.groupingBy(
+//                                        TaskDispatchDetailDO::getDispatchCode,
+//                                        () -> new TreeMap<>(Comparator.reverseOrder()),
+//                                        Collectors.toList()
+//                                ));
+//
+//                    }else {
+//                        collect = list.stream()
+//                                .collect(Collectors.groupingBy(
+//                                        TaskDispatchDetailDO::getDispatchCode,
+//                                        TreeMap::new,
+//                                        Collectors.toList()
+//                                ));
+//                    }
+//            collect.forEach((code,list2)->{
+//                afterList.addAll(list2);
+//            });
+//        }
+//        taskDispatchDetailDOPageResult.setList(afterList);
         return taskDispatchDetailDOPageResult;
     }
     @Override