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 3be5040e..b94add18 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 f62eedfd..9b11ca2d 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); } }