diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java index b7d263ca..17876277 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java @@ -524,7 +524,7 @@ public class TaskVo { } @Data - @ApiModel("每周任务的交付物") + @ApiModel("周会任务相关") public static class AboutWeekTask { @JsonIgnore @ApiModelProperty("任务详情名称") diff --git a/tall/src/main/resources/mapper_dao/ProRoleDao.xml b/tall/src/main/resources/mapper_dao/ProRoleDao.xml index 71a80495..06100c3c 100644 --- a/tall/src/main/resources/mapper_dao/ProRoleDao.xml +++ b/tall/src/main/resources/mapper_dao/ProRoleDao.xml @@ -394,7 +394,7 @@ FROM t_pro_role WHERE - parent_id = ( + parent_id in ( SELECT id FROM t_pro_role WHERE project_id = #{projectId} and `name` = 'PM' ) and