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);