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 e68dd5e4..76782d00 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 @@ -502,7 +502,9 @@ public class PqDevServiceImpl extends ServiceImpl implements queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy())); } } - queryWrapper.eq("pq_dev.state", DataStateEnum.ENABLE.getCode()).orderBy(true, false, "pq_dev.Create_Time"); + queryWrapper.eq("pq_dev.state", DataStateEnum.ENABLE.getCode()) + .orderByDesc("pq_dev.Create_Time") + .orderByAsc("pq_dev.name"); return queryWrapper; }