diff --git a/src/main/java/cn/lihongjie/coal/dataCollectorLog/controller/DataCollectorLogController.java b/src/main/java/cn/lihongjie/coal/dataCollectorLog/controller/DataCollectorLogController.java index d2146567..ab4c85a2 100644 --- a/src/main/java/cn/lihongjie/coal/dataCollectorLog/controller/DataCollectorLogController.java +++ b/src/main/java/cn/lihongjie/coal/dataCollectorLog/controller/DataCollectorLogController.java @@ -49,6 +49,7 @@ public class DataCollectorLogController { @PostMapping("/list") public Page list(@RequestBody CommonQuery request) { + return this.service.list(request); } } diff --git a/src/main/java/cn/lihongjie/coal/dataCollectorLog/service/DataCollectorLogService.java b/src/main/java/cn/lihongjie/coal/dataCollectorLog/service/DataCollectorLogService.java index 5e48c4c9..be52764b 100644 --- a/src/main/java/cn/lihongjie/coal/dataCollectorLog/service/DataCollectorLogService.java +++ b/src/main/java/cn/lihongjie/coal/dataCollectorLog/service/DataCollectorLogService.java @@ -1,5 +1,9 @@ package cn.lihongjie.coal.dataCollectorLog.service; +import static org.springframework.data.domain.Sort.Order.asc; + +import static java.util.Collections.singletonList; + import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.base.service.BaseService; @@ -13,6 +17,7 @@ import cn.lihongjie.coal.dbFunctions.DbFunctionService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.ConversionService; import org.springframework.data.domain.Page; @@ -67,7 +72,7 @@ public class DataCollectorLogService PageRequest.of( query.getPageNo(), query.getPageSize(), - Sort.by(query.getOrders()))); + Sort.by(CollectionUtils.isEmpty(query.getOrders()) ? singletonList(asc("createTime")) : query.getOrders()))); return page.map(this.mapper::toDto); }