Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 594901b2 12196b49
Showing 1 changed file with 5 additions and 3 deletions
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
@@ -246,9 +246,11 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
     @Transactional(rollbackFor = Exception.class)
     public void endTask(CluePool cluePool) {
         FollowTask task = followTaskService.queryOngoingTaskByClueId(cluePool.getId());
-        task.setCloseTime(LocalDateTime.now());
-        task.setReason(TaskDefeatTypeEnum.E);
-        endTask(task, false);
+        if (Objects.nonNull(task)) {
+            task.setCloseTime(LocalDateTime.now());
+            task.setReason(TaskDefeatTypeEnum.E);
+            endTask(task, false);
+        }
     }
  
     @Override