From 2e8a7c40d926c37b2abd6eb807582d38be144b27 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Wed, 19 Mar 2025 23:37:13 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/asset/service/impl/ExecJobServiceImpl.java | 7 ++++--- .../module/asset/service/impl/ExecLogServiceImpl.java | 7 ++++--- .../module/asset/service/impl/ExecTemplateServiceImpl.java | 7 ++++--- .../module/asset/service/impl/HostIdentityServiceImpl.java | 4 +++- .../module/asset/service/impl/HostKeyServiceImpl.java | 4 +++- .../visor/module/asset/service/impl/HostServiceImpl.java | 7 ++++--- .../asset/service/impl/TerminalConnectLogServiceImpl.java | 7 ++++--- .../module/asset/service/impl/TerminalSftpServiceImpl.java | 1 + .../module/asset/service/impl/UploadTaskServiceImpl.java | 7 ++++--- .../visor/module/infra/api/impl/OperatorLogApiImpl.java | 6 +++--- .../module/infra/service/impl/DictKeyServiceImpl.java | 6 ++++-- .../module/infra/service/impl/DictValueServiceImpl.java | 7 ++++--- .../module/infra/service/impl/HistoryValueServiceImpl.java | 7 ++++--- .../module/infra/service/impl/OperatorLogServiceImpl.java | 7 ++++--- .../module/infra/service/impl/SystemRoleServiceImpl.java | 4 +++- .../module/infra/service/impl/SystemUserServiceImpl.java | 3 ++- 16 files changed, 55 insertions(+), 36 deletions(-) diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java index fe0a56be..4fcc5cc4 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java @@ -246,8 +246,10 @@ public class ExecJobServiceImpl implements ExecJobService { // 条件 LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询任务 - DataGrid dataGrid = execJobDAO.of(wrapper) + DataGrid dataGrid = execJobDAO.of() + .wrapper(wrapper) .page(request) + .order(request, ExecJobDO::getId) .dataGrid(ExecJobConvert.MAPPER::to); if (!Booleans.isTrue(request.getQueryRecentLog())) { return dataGrid; @@ -409,8 +411,7 @@ public class ExecJobServiceImpl implements ExecJobService { .like(ExecJobDO::getName, request.getName()) .like(ExecJobDO::getCommand, request.getCommand()) .eq(ExecJobDO::getStatus, request.getStatus()) - .eq(ExecJobDO::getExecUserId, request.getExecUserId()) - .orderByDesc(ExecJobDO::getId); + .eq(ExecJobDO::getExecUserId, request.getExecUserId()); } /** diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java index 78ce7fd5..c0749085 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java @@ -109,11 +109,12 @@ public class ExecLogServiceImpl implements ExecLogService { @Override public DataGrid getExecLogPage(ExecLogQueryRequest request) { // 条件 - LambdaQueryWrapper wrapper = this.buildQueryWrapper(request) - .orderByDesc(ExecLogDO::getId); + LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 - return execLogDAO.of(wrapper) + return execLogDAO.of() + .wrapper(wrapper) .page(request) + .order(request, ExecLogDO::getId) .dataGrid(ExecLogConvert.MAPPER::to); } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java index 6db5d4c5..6695dd52 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java @@ -146,8 +146,10 @@ public class ExecTemplateServiceImpl implements ExecTemplateService { // 条件 LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询模板 - return execTemplateDAO.of(wrapper) + return execTemplateDAO.of() + .wrapper(wrapper) .page(request) + .order(request, ExecTemplateDO::getId) .dataGrid(ExecTemplateConvert.MAPPER::to); } @@ -204,8 +206,7 @@ public class ExecTemplateServiceImpl implements ExecTemplateService { return execTemplateDAO.wrapper() .eq(ExecTemplateDO::getId, request.getId()) .like(ExecTemplateDO::getName, request.getName()) - .like(ExecTemplateDO::getCommand, request.getCommand()) - .orderByDesc(ExecTemplateDO::getId); + .like(ExecTemplateDO::getCommand, request.getCommand()); } } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java index 9962d945..0aa09e74 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java @@ -182,8 +182,10 @@ public class HostIdentityServiceImpl implements HostIdentityService { // 条件 LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 - DataGrid dataGrid = hostIdentityDAO.of(wrapper) + DataGrid dataGrid = hostIdentityDAO.of() + .wrapper(wrapper) .page(request) + .order(request, HostIdentityDO::getId) .dataGrid(HostIdentityConvert.MAPPER::to); if (dataGrid.isEmpty()) { return dataGrid; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java index f09ad180..ad1b7c00 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java @@ -185,8 +185,10 @@ public class HostKeyServiceImpl implements HostKeyService { // 条件 LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 - DataGrid dataGrid = hostKeyDAO.of(wrapper) + DataGrid dataGrid = hostKeyDAO.of() + .wrapper(wrapper) .page(request) + .order(request, HostKeyDO::getId) .dataGrid(HostKeyConvert.MAPPER::to); dataGrid.forEach(this::toSafe); return dataGrid; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java index 8d9b0c45..68cd4052 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java @@ -281,11 +281,12 @@ public class HostServiceImpl implements HostService { // 数量条件 LambdaQueryWrapper countWrapper = wrapper.clone(); // 基础条件 - wrapper.select(HostDAO.BASE_COLUMN) - .orderByAsc(HostDO::getId); + wrapper.select(HostDAO.BASE_COLUMN); // 查询 - DataGrid hosts = hostDAO.of(wrapper) + DataGrid hosts = hostDAO.of() + .wrapper(wrapper) .page(request) + .order(request, HostDO::getId) .dataGrid(countWrapper, HostConvert.MAPPER::to); // 查询拓展信息 this.setExtraInfo(request, hosts.getRows()); diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java index e0383480..9e29734c 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java @@ -92,11 +92,12 @@ public class TerminalConnectLogServiceImpl implements TerminalConnectLogService @Override public DataGrid getTerminalConnectLogPage(TerminalConnectLogQueryRequest request) { // 条件 - LambdaQueryWrapper wrapper = this.buildQueryWrapper(request) - .orderByDesc(TerminalConnectLogDO::getId); + LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 - return terminalConnectLogDAO.of(wrapper) + return terminalConnectLogDAO.of() + .wrapper(wrapper) .page(request) + .order(request, TerminalConnectLogDO::getId) .dataGrid(s -> { TerminalConnectLogVO vo = TerminalConnectLogConvert.MAPPER.to(s); vo.setExtra(JSON.parseObject(s.getExtraInfo(), TerminalConnectLogExtraDTO.class)); diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java index 096d134a..6312497a 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java @@ -225,6 +225,7 @@ public class TerminalSftpServiceImpl implements TerminalSftpService { .build(); query.setPage(request.getPage()); query.setLimit(request.getLimit()); + query.setOrder(request.getOrder()); if (Strings.isBlank(type)) { // 查询全部 SFTP 类型 query.setTypeList(TerminalOperatorType.SFTP_TYPES); diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java index dfe33b87..1f906aef 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java @@ -190,11 +190,12 @@ public class UploadTaskServiceImpl implements UploadTaskService { @Override public DataGrid getUploadTaskPage(UploadTaskQueryRequest request) { // 条件 - LambdaQueryWrapper wrapper = this.buildQueryWrapper(request) - .orderByDesc(UploadTaskDO::getId); + LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 - return uploadTaskDAO.of(wrapper) + return uploadTaskDAO.of() + .wrapper(wrapper) .page(request) + .order(request, UploadTaskDO::getId) .dataGrid(UploadTaskConvert.MAPPER::to); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java index 1ddb8b16..7f00e39f 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java @@ -58,8 +58,9 @@ public class OperatorLogApiImpl implements OperatorLogApi { LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 return operatorLogDAO.of() - .page(request) .wrapper(wrapper) + .page(request) + .order(request, OperatorLogDO::getId) .dataGrid(OperatorLogProviderConvert.MAPPER::to); } @@ -85,8 +86,7 @@ public class OperatorLogApiImpl implements OperatorLogApi { .eq(OperatorLogDO::getResult, request.getResult()) .like(OperatorLogDO::getExtra, request.getExtra()) .ge(OperatorLogDO::getStartTime, request.getStartTimeStart()) - .le(OperatorLogDO::getStartTime, request.getStartTimeEnd()) - .orderByDesc(OperatorLogDO::getId); + .le(OperatorLogDO::getStartTime, request.getStartTimeEnd()); } } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java index edc92e8a..c8c57bac 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java @@ -148,8 +148,10 @@ public class DictKeyServiceImpl implements DictKeyService { // 条件 LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 - return dictKeyDAO.of(wrapper) + return dictKeyDAO.of() + .wrapper(wrapper) .page(request) + .order(request, DictKeyDO::getId) .dataGrid(DictKeyConvert.MAPPER::to); } @@ -264,7 +266,7 @@ public class DictKeyServiceImpl implements DictKeyService { .and(Strings.isNotEmpty(searchValue), c -> c .like(DictKeyDO::getKeyName, searchValue).or() .like(DictKeyDO::getDescription, searchValue) - ).orderByDesc(DictKeyDO::getId); + ); } } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java index 51470be3..7557e510 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java @@ -231,8 +231,10 @@ public class DictValueServiceImpl implements DictValueService { // 条件 LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 - DataGrid dataGrid = dictValueDAO.of(wrapper) + DataGrid dataGrid = dictValueDAO.of() + .wrapper(wrapper) .page(request) + .order(request, DictValueDO::getId) .dataGrid(DictValueConvert.MAPPER::to); if (!dataGrid.isEmpty()) { List keyIdList = dataGrid.stream() @@ -408,8 +410,7 @@ public class DictValueServiceImpl implements DictValueService { .like(DictValueDO::getKeyName, request.getKeyName()) .like(DictValueDO::getValue, request.getValue()) .like(DictValueDO::getLabel, request.getLabel()) - .like(DictValueDO::getExtra, request.getExtra()) - .orderByDesc(DictValueDO::getId); + .like(DictValueDO::getExtra, request.getExtra()); } /** diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java index 17d5a7ce..f036f271 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java @@ -70,8 +70,10 @@ public class HistoryValueServiceImpl implements HistoryValueService { // 条件 LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 - return historyValueDAO.of(wrapper) + return historyValueDAO.of() + .wrapper(wrapper) .page(request) + .order(request, HistoryValueDO::getId) .dataGrid(HistoryValueConvert.MAPPER::to); } @@ -121,8 +123,7 @@ public class HistoryValueServiceImpl implements HistoryValueService { .and(Strings.isNotEmpty(searchValue), c -> c .like(HistoryValueDO::getBeforeValue, searchValue).or() .like(HistoryValueDO::getAfterValue, searchValue) - ) - .orderByDesc(HistoryValueDO::getId); + ); } } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java index 2024ee46..51127c51 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java @@ -71,11 +71,12 @@ public class OperatorLogServiceImpl implements OperatorLogService { @Override public DataGrid getOperatorLogPage(OperatorLogQueryRequest request) { // 条件 - LambdaQueryWrapper wrapper = this.buildQueryWrapper(request) - .orderByDesc(OperatorLogDO::getId); + LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 - return operatorLogDAO.of(wrapper) + return operatorLogDAO.of() + .wrapper(wrapper) .page(request) + .order(request, OperatorLogDO::getId) .dataGrid(OperatorLogConvert.MAPPER::to); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java index 401749d5..fa28835a 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java @@ -176,8 +176,10 @@ public class SystemRoleServiceImpl implements SystemRoleService { .like(SystemRoleDO::getName, request.getName()) .like(SystemRoleDO::getDescription, request.getDescription()); // 查询 - return systemRoleDAO.of(wrapper) + return systemRoleDAO.of() + .wrapper(wrapper) .page(request) + .order(request, SystemRoleDO::getId) .dataGrid(SystemRoleConvert.MAPPER::to); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java index 2abbd2f8..997378f2 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java @@ -230,8 +230,9 @@ public class SystemUserServiceImpl implements SystemUserService { LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 return systemUserDAO.of() - .page(request) .wrapper(wrapper) + .page(request) + .order(request, SystemUserDO::getId) .dataGrid(SystemUserConvert.MAPPER::to); }