From 7f5aba5012c1753392279f27db3dcf043f5d1318 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 五月 2026 21:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpAdminOperationLogServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpAdminOperationLogServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpAdminOperationLogServiceImpl.java
index f01c0d9..bdc2ee8 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpAdminOperationLogServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpAdminOperationLogServiceImpl.java
@@ -10,6 +10,8 @@
import com.xiaopeng.operation.service.IXpAdminOperationLogService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* 管理后台操作记录服务实现
*/
@@ -20,9 +22,24 @@
@Override
public PageInfo<XpAdminOperationLog> pageList(AdminOperationLogPageQuery query) {
PageInfo<XpAdminOperationLog> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ return page(pageInfo, buildQueryWrapper(query));
+ }
+
+ @Override
+ public List<XpAdminOperationLog> exportList(AdminOperationLogPageQuery query) {
+ return list(buildQueryWrapper(query));
+ }
+
+ private LambdaQueryWrapper<XpAdminOperationLog> buildQueryWrapper(AdminOperationLogPageQuery query) {
LambdaQueryWrapper<XpAdminOperationLog> wrapper = new LambdaQueryWrapper<>();
+ if (query == null) {
+ return wrapper.orderByDesc(XpAdminOperationLog::getOperationTime);
+ }
if (query.getBusinessType() != null) {
wrapper.eq(XpAdminOperationLog::getBusinessType, query.getBusinessType());
+ }
+ if (StringUtils.isNotEmpty(query.getBusinessTypeName())) {
+ wrapper.like(XpAdminOperationLog::getBusinessTypeName, query.getBusinessTypeName());
}
if (StringUtils.isNotEmpty(query.getOperatorName())) {
wrapper.like(XpAdminOperationLog::getOperatorName, query.getOperatorName());
@@ -36,6 +53,6 @@
if (query.getStartTime() != null && query.getEndTime() != null) {
wrapper.between(XpAdminOperationLog::getOperationTime, query.getStartTime(), query.getEndTime());
}
- return page(pageInfo, wrapper.orderByDesc(XpAdminOperationLog::getOperationTime));
+ return wrapper.orderByDesc(XpAdminOperationLog::getOperationTime);
}
}
--
Gitblit v1.7.1