From 8003a29d3f510adfa971ea6ebd23af1ccd7316c1 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期二, 05 三月 2024 15:37:10 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/ApiLogController.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java index 1ba16f5..36ed259 100644 --- a/src/main/java/com/zy/asrs/controller/ApiLogController.java +++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java @@ -38,11 +38,15 @@ @RequestParam(defaultValue = "10")Integer limit, @RequestParam(required = false)String orderByField, @RequestParam(required = false)String orderByType, + @RequestParam(required = false)String condition, @RequestParam Map<String, Object> param){ EntityWrapper<ApiLog> wrapper = new EntityWrapper<>(); excludeTrash(param); convert(param, wrapper); - if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} + allLike(ApiLog.class, param.keySet(), wrapper, condition); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else { + wrapper.orderBy("create_time", false); + } return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper)); } -- Gitblit v1.9.1