From 24dcb9df96587f10b05ab1c12a7222d6b1982227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 29 Jan 2026 17:57:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-1286=20=E8=AE=BE=E5=A4=87=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E5=85=AC=E5=8F=B8=E8=BD=AC=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/mobilebroken/admin/controller/DeviceController.java | 2 ++ .../nflg/mobilebroken/common/pojo/vo/DeviceAgentRecordVO.java | 2 ++ .../nflg/mobilebroken/gongfu/controller/DeviceController.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java index 04c6b854..d1451b43 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java @@ -823,6 +823,7 @@ public class DeviceController extends ControllerBase { List vos = new ArrayList<>(); for (DeviceAgentRecord r : list) { DeviceAgentRecordVO vo = new DeviceAgentRecordVO() + .setId(r.getId()) .setOldAgentCode(oldAgentCode) .setOldAgentName(oldAgentName) .setNewAgentCode(r.getAgentCode()) @@ -833,6 +834,7 @@ public class DeviceController extends ControllerBase { oldAgentName = r.getAgentName(); vos.add(vo); } + vos.sort(Comparator.comparingLong(DeviceAgentRecordVO::getId).reversed()); return ApiResult.success(vos); } } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceAgentRecordVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceAgentRecordVO.java index 1dad68ce..f2b0940b 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceAgentRecordVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceAgentRecordVO.java @@ -9,6 +9,8 @@ import java.time.LocalDateTime; @Accessors(chain = true) public class DeviceAgentRecordVO { + private Long id; + /** * 变更前公司编码 */ diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java index 3354ad68..1e7491e9 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java @@ -867,6 +867,7 @@ public class DeviceController extends ControllerBase { List vos = new ArrayList<>(); for (GongfuDeviceAgentRecord r : list) { DeviceAgentRecordVO vo = new DeviceAgentRecordVO() + .setId(r.getId()) .setOldAgentCode(oldAgentCode) .setOldAgentName(oldAgentName) .setNewAgentCode(r.getAgentCode()) @@ -877,6 +878,7 @@ public class DeviceController extends ControllerBase { oldAgentName = r.getAgentName(); vos.add(vo); } + vos.sort(Comparator.comparingLong(DeviceAgentRecordVO::getId).reversed()); return ApiResult.success(vos); } }