From 3d8b560f279857ade6778af8a6c41fd2b3a0bc5f Mon Sep 17 00:00:00 2001
From: Kurisu <makise_kurisuu@outlook.jp>
Date: Sat, 23 Oct 2021 10:21:24 +0800
Subject: [PATCH] :bug: 修复日期计算错误的bug

---
 fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
index fc4779e..0589b3e 100644
--- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
+++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
@@ -932,9 +932,9 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
             if (newTime.before(originTime)) {
                 return true;
             }
-            newDeadLine = DateUtil.getExpiredSecond(calDate(efsetting.get(), newTime, false), -1);
+            newDeadLine = calDate(efsetting.get(), newTime, false);
         }
-
+        newDeadLine = DateUtil.getExpiredSecond(newDeadLine, -1);
         final FollowRecord newRecord = this.getEntity(task, newTime, newDeadLine);
         return followRecordService.queryAndSave(newRecord);
     }
--
libgit2 0.22.2