diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java index acab709..cb5c75f 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java @@ -23,11 +23,11 @@ import cn.fw.valhalla.domain.enums.*; import cn.fw.valhalla.domain.query.LeaveQueryVO; import cn.fw.valhalla.domain.vo.DistributableVO; import cn.fw.valhalla.domain.vo.LeaveNeedDoVO; +import cn.fw.valhalla.rpc.backlog.TodoRpcService; +import cn.fw.valhalla.rpc.backlog.dto.BackLogItemDTO; import cn.fw.valhalla.rpc.ehr.EhrRpcService; import cn.fw.valhalla.rpc.ehr.dto.StaffInfoDTO; -import cn.fw.valhalla.rpc.backlog.TodoRpcService; import cn.fw.valhalla.rpc.erp.UserService; -import cn.fw.valhalla.rpc.backlog.dto.BackLogItemDTO; import cn.fw.valhalla.rpc.erp.dto.PostUserDTO; import cn.fw.valhalla.rpc.erp.dto.UserInfoDTO; import cn.fw.valhalla.rpc.erp.dto.UserRoleDataRangeDTO; @@ -167,11 +167,10 @@ public class LeaveNeedDoBizService { .eq(FollowTask::getRedistribution, dto.getAdviserId()) .in(FollowTask::getType, enumList) ); - if (CollectionUtils.isEmpty(taskList)) { - return; - } - for (FollowTask followTask : taskList) { - dealTask(followTask); + if (!CollectionUtils.isEmpty(taskList)) { + for (FollowTask followTask : taskList) { + dealTask(followTask); + } } //完成分配发送消息提醒等 finish(user, dto.getId(), key);