diff --git a/src/main/java/com/ccsens/ptccsens/service/TallService.java b/src/main/java/com/ccsens/ptccsens/service/TallService.java index e35bef8..f9e813c 100644 --- a/src/main/java/com/ccsens/ptccsens/service/TallService.java +++ b/src/main/java/com/ccsens/ptccsens/service/TallService.java @@ -755,19 +755,19 @@ public class TallService implements ITallService { //根据时间基准线查询当前正在进行的任务(如果多个则选择时间最早的一个) Long queryTime = param.getTimeNode(); -// if(CollectionUtil.isNotEmpty(roleList)) { -// Long startTime = proTaskSubDao.getTimeByProgressTaskAndRoleList(param.getTimeNode(), roleList); -// if (ObjectUtil.isNotNull(startTime)) { -// queryTime = startTime; -// } -// } + if(CollectionUtil.isNotEmpty(roleList)) { + Long startTime = proTaskSubDao.getTimeByProgressTaskAndRoleList(param.getTimeNode(), roleList); + if (ObjectUtil.isNotNull(startTime)) { + queryTime = startTime; + } + } if(CollectionUtil.isNotEmpty(roleList)){ //通过角色和时间等信息,查找任务,如果传入的参数有任务id且code符合当前服务,则排除该任务 String taskId = Constant.BUSINESS_CODE.equals(param.getBusinessCode()) ? param.getTaskId() : null; PageHelper.startPage(param.getPageNum(),param.getPageSize()); queryTaskList = taskDetailDao.getAllTaskByRoleList(roleList,queryTime,param.getTimeUnit(),param.getQueryType(),taskId); } - return queryTaskList; } + }