From e99ba2ef1eaa979c84ca6cc3e969470feba6d084 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Wed, 26 Jul 2023 09:28:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=202.0.3=201.=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../easy/retry/server/service/impl/RetryServiceImpl.java     | 5 ++++-
 pom.xml                                                      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java
index 807244f1d..f3235f553 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java
@@ -33,7 +33,6 @@ import com.aizuda.easy.retry.server.service.convert.RetryTaskConverter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
@@ -233,6 +232,7 @@ public class RetryServiceImpl implements RetryService {
             waitDelDeadLetters.addAll(finishCallbackRetryIdList);
         }
 
+        RequestDataHelper.setPartition(groupName);
         Assert.isTrue(waitDelDeadLetters.size() == retryTaskMapper.deleteBatchIds(waitDelDeadLetters),
             () -> new EasyRetryServerException("删除重试数据失败 [{}]", JsonUtil.toJsonString(retryTasks)));
 
@@ -246,6 +246,9 @@ public class RetryServiceImpl implements RetryService {
      * @param retryTasks 待迁移数据
      */
     private void moveDeadLetters(String groupName, List<RetryTask> retryTasks) {
+        if (CollectionUtils.isEmpty(retryTasks)) {
+            return;
+        }
 
         List<RetryDeadLetter> retryDeadLetters = RetryDeadLetterConverter.INSTANCE.toRetryDeadLetter(retryTasks);
 
diff --git a/pom.xml b/pom.xml
index a8a04d11e..7e4603fc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <java.version>1.8</java.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <revision>2.0.2</revision>
+        <revision>2.0.3-SNAPSHOT</revision>
         <dingding-talk.version>1.0.0</dingding-talk.version>
         <hibernate-validator.version>5.4.2.Final</hibernate-validator.version>
         <netty-all.version>4.1.48.Final</netty-all.version>