From ccfd1cac7ce742837674bad6495c17de974f117a Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Wed, 3 Apr 2024 16:59:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(3.2.0):=20=E4=BC=98=E5=8C=96=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=97=A5=E5=BF=97=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/persistence/mapper/SceneConfigMapper.java | 1 - .../easy/retry/server/web/service/impl/JobLogServiceImpl.java | 2 +- .../retry/server/web/service/impl/RetryTaskLogServiceImpl.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/SceneConfigMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/SceneConfigMapper.java index 4b63603c..0064d91f 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/SceneConfigMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/SceneConfigMapper.java @@ -4,7 +4,6 @@ import com.aizuda.easy.retry.template.datasource.persistence.po.SceneConfig; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -@InterceptorIgnore(tenantLine = "false") public interface SceneConfigMapper extends BaseMapper { } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobLogServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobLogServiceImpl.java index 24688df8..9d7a1d29 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobLogServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobLogServiceImpl.java @@ -103,7 +103,7 @@ public class JobLogServiceImpl implements JobLogService { if (messages.size() + size >= queryVO.getSize()) { messages.addAll(pageList); nextStartId = jobLogMessage.getId(); - fromIndex = Math.min(fromIndex + queryVO.getSize(), originalList.size() - 1); + fromIndex = Math.min(fromIndex + queryVO.getSize(), originalList.size() - 1) + 1; break; } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskLogServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskLogServiceImpl.java index 65e88107..7e8dea93 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskLogServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskLogServiceImpl.java @@ -149,7 +149,7 @@ public class RetryTaskLogServiceImpl implements RetryTaskLogService { if (messages.size() + size >= queryVO.getSize()) { messages.addAll(pageList); nextStartId = retryTaskLogMessage.getId(); - fromIndex = Math.min(fromIndex + queryVO.getSize(), originalList.size() - 1); + fromIndex = Math.min(fromIndex + queryVO.getSize(), originalList.size() - 1) + 1; break; }