From 067dbdd58c7b2a64bce6a408a3ce0465587e7711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=98=89=E5=A4=9A=E5=AE=9D=E5=AE=9D?= Date: Mon, 5 Jan 2026 16:06:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=95=86=E6=B4=BB=E5=8A=A8=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8C=89=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminAgentActivityLogServiceImpl.java | 31 ++++--------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentActivityLogServiceImpl.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentActivityLogServiceImpl.java index c23e611..ecb9f20 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentActivityLogServiceImpl.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentActivityLogServiceImpl.java @@ -30,32 +30,13 @@ public class AdminAgentActivityLogServiceImpl implements IAdminAgentActivityLogS @Override public PageListBean pageList(AgentActivityLogQueryReq query) { Page page = new Page<>(query.getPageNum(), query.getPageSize()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - - // 根据活动ID查询 - if (query.getActivityId() != null) { - wrapper.eq(MpAgentActivityLogEntity::getActivityId, query.getActivityId()); - } - - // 根据操作人ID查询 - if (query.getOperatorId() != null) { - wrapper.eq(MpAgentActivityLogEntity::getOperatorId, query.getOperatorId()); - } - - // 根据操作类型查询 - if (query.getOperationType() != null && !query.getOperationType().isEmpty()) { - wrapper.eq(MpAgentActivityLogEntity::getOperationType, query.getOperationType()); - } - - // 根据创建时间范围查询 - if (query.getStartTime() != null) { - wrapper.ge(MpAgentActivityLogEntity::getCreateTime, query.getStartTime()); - } - if (query.getEndTime() != null) { - wrapper.le(MpAgentActivityLogEntity::getCreateTime, query.getEndTime()); - } - wrapper.orderByDesc(MpAgentActivityLogEntity::getUpdateTime); + wrapper.eq(query.getActivityId() != null, MpAgentActivityLogEntity::getActivityId, query.getActivityId()) + .eq(query.getOperatorId() != null, MpAgentActivityLogEntity::getOperatorId, query.getOperatorId()) + .eq(query.getOperationType() != null, MpAgentActivityLogEntity::getOperationType, query.getOperationType()) + .ge(query.getStartTime() != null, MpAgentActivityLogEntity::getCreateTime, query.getStartTime()) + .le(query.getEndTime() != null, MpAgentActivityLogEntity::getCreateTime, query.getEndTime()) + .orderByDesc(MpAgentActivityLogEntity::getUpdateTime); IPage result = mpAgentActivityLogService.page(page, wrapper);