diff --git a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java index 76782d00..95be73b2 100644 --- a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java @@ -293,7 +293,8 @@ public class PqDevServiceImpl extends ServiceImpl implements .eq(PqDev::getPattern, pattern) .eq(PqDev::getState, DataStateEnum.ENABLE.getCode()) .isNull(PqDev::getPlanId) - .orderByAsc(PqDev::getCreateTime).list(); + .orderByDesc(PqDev::getCreateTime) + .orderByAsc(PqDev::getName).list(); List> result = pqDevList.stream().map(pqDev -> { Map map = new HashMap<>(); map.put("id", pqDev.getId());