Merge remote-tracking branch 'origin/test'

张志伟
2 parents 05b6aafd de93e423
Showing 1 changed file with 13 additions and 0 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java
@@ -160,6 +160,19 @@ public class LeaveNeedDoBizService {
             List<Customer> customerList = doAllocation(dto, key);
             //分配跟进任务
             dealFollowTask(customerList);
+
+            List<FollowTypeEnum> enumList = Arrays.asList(FollowTypeEnum.FM, FollowTypeEnum.RM);
+            List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery()
+                    .eq(FollowTask::getState, TaskStateEnum.ONGOING)
+                    .eq(FollowTask::getRedistribution, dto.getAdviserId())
+                    .in(FollowTask::getType, enumList)
+            );
+            if (CollectionUtils.isEmpty(taskList)) {
+                return;
+            }
+            for (FollowTask followTask : taskList) {
+                dealTask(followTask);
+            }
             //完成分配发送消息提醒等
             finish(user, dto.getId(), key);
         } finally {