diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index be43e90d..1cd8a7ec 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -744,10 +744,8 @@ public class ProTaskDetailService implements IProTaskDetailService { } //任务配置 taskDetail.setProTaskConfig(getProTaskShow(taskDetail.getDetailId())); - //添加项目信息 normalTaskAddPlugin(taskId, taskDetail); - List groupTaskList = new ArrayList<>(); //提醒信息 taskDetail.setRemindInfoList(proRemindDao.queryRemindByTask(taskDetail.getId())); @@ -789,7 +787,6 @@ public class ProTaskDetailService implements IProTaskDetailService { taskDetail.setSecondTasks(new ArrayList<>()); taskDetail.getSecondTasks().addAll(groupTaskList); } - } return taskDetail; } diff --git a/tall/src/main/resources/mapper_dao/DeliverDao.xml b/tall/src/main/resources/mapper_dao/DeliverDao.xml index 1476ef86..acd9824d 100644 --- a/tall/src/main/resources/mapper_dao/DeliverDao.xml +++ b/tall/src/main/resources/mapper_dao/DeliverDao.xml @@ -258,27 +258,33 @@ on d.id = p.deliver_id and p.task_sub_time_id = #{subTimeId} and p.rec_status = 0 + and p.is_history = 0 LEFT JOIN t_pro_task_deliver_post_log_checker pc on pc.deliver_post_log_id = p.id and pc.rec_status = 0 LEFT JOIN ( - SELECT + SELECT r.id as checkerId, r.`name` as checkerName, - if(m.user_id = #{userId},TRUE,FALSE) as isChecker + if(a.user_id is null,FALSE,TRUE) as isChecker + FROM + t_pro_role r + LEFT JOIN + (SELECT + mr.role_id, + m.user_id FROM - t_pro_role r, t_pro_member_role mr, t_pro_member m WHERE - r.id = mr.role_id - and mr.member_id = m.id - and r.parent_id != 0 - and r.rec_status = 0 + mr.member_id = m.id and mr.rec_status = 0 and m.rec_status = 0 - GROUP BY r.id + )a on a.role_id = r.id and a.user_id = #{userId} + WHERE + r.rec_status = 0 + and r.parent_id != 0 ) r on r.checkerId = pc.checker_id WHERE d.task_detail_id = #{taskDetailId}