diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 76f9683a..bfa7d6e3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -503,7 +503,6 @@ public class InspectionTaskController extends BladeController { List preserveSlotList = new ArrayList<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("RFP_ID", rfpId); - queryWrapper.orderByDesc("create_time"); preserveSlotList = mesRbFilePreserveSlotService.list(queryWrapper); // QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -546,7 +545,9 @@ public class InspectionTaskController extends BladeController { dsRbFilePreserveSlot.setChildrenList(childrenListNew); } } - preserveSlotList.sort(Comparator.comparing(MesRbFilePreserveSlotEntity::getSlotIndex)); + preserveSlotList.sort(Comparator.comparing( + e -> Integer.parseInt(e.getSlotIndex()) + )); obj.put("preserveSlotList",preserveSlotList); obj.put("insertIndex",insertIndex); return R.data(obj);