diff --git a/common/src/main/java/com/ccsens/common/service/TaskService.java b/common/src/main/java/com/ccsens/common/service/TaskService.java
index 82cf1afc..206b0a9c 100644
--- a/common/src/main/java/com/ccsens/common/service/TaskService.java
+++ b/common/src/main/java/com/ccsens/common/service/TaskService.java
@@ -195,20 +195,21 @@ public class TaskService implements ITaskService {
         if (BooleanUtil.isFalse(isLook)) {
             throw new BaseException(CommonCodeError.NOT_PERMISSION);
         }
-        //查询当前角色是否项目经理
         List<Long> roleIds = new ArrayList<>();
-        List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId());
-        if (CollectionUtil.isNotEmpty(roleList)){
-            List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList());
-            if (CollectionUtil.isNotEmpty(roles)){
-                if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){
-                    List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList());
-                    roleIds.addAll(allRoleId);
-                }else{
-                    roleIds.add(param.getRoleId());
-                }
-            }
-        }
+        roleIds.add(param.getRoleId());
+        //查询当前角色是否项目经理
+//        List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId());
+//        if (CollectionUtil.isNotEmpty(roleList)){
+//            List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList());
+//            if (CollectionUtil.isNotEmpty(roles)){
+//                if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){
+//                    List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList());
+//                    roleIds.addAll(allRoleId);
+//                }else{
+//                    roleIds.add(param.getRoleId());
+//                }
+//            }
+//        }
         List<CTaskVo.QueryTask> permanentGlobalTask = taskDetailDao.queryPermanentGlobalTask(roleIds);
         //查找项目面板和插件信息
         queryPluginForTask(permanentGlobalTask);
@@ -223,20 +224,22 @@ public class TaskService implements ITaskService {
         if (BooleanUtil.isFalse(isLook)) {
             throw new BaseException(CommonCodeError.NOT_PERMISSION);
         }
-        //查询当前角色是否项目经理
         List<Long> roleIds = new ArrayList<>();
-        List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId());
-        if (CollectionUtil.isNotEmpty(roleList)){
-            List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList());
-            if (CollectionUtil.isNotEmpty(roles)){
-                if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){
-                    List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList());
-                    roleIds.addAll(allRoleId);
-                }else{
-                    roleIds.add(param.getRoleId());
-                }
-            }
-        }
+        roleIds.add(param.getRoleId());
+        //查询当前角色是否项目经理
+//        List<Long> roleIds = new ArrayList<>();
+//        List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId());
+//        if (CollectionUtil.isNotEmpty(roleList)){
+//            List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList());
+//            if (CollectionUtil.isNotEmpty(roles)){
+//                if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){
+//                    List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList());
+//                    roleIds.addAll(allRoleId);
+//                }else{
+//                    roleIds.add(param.getRoleId());
+//                }
+//            }
+//        }
         List<CTaskVo.QueryTask> globalTask = taskDetailDao.queryGlobalTask(roleIds, param.getTimeNode(), param.getTimeUnit());
         queryPluginForTask(globalTask);
         return globalTask;
@@ -259,20 +262,22 @@ public class TaskService implements ITaskService {
         if (BooleanUtil.isFalse(isLook)) {
             throw new BaseException(CommonCodeError.NOT_PERMISSION);
         }
-        //查询当前角色是否项目经理
         List<Long> roleIds = new ArrayList<>();
-        List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId());
-        if (CollectionUtil.isNotEmpty(roleList)){
-            List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList());
-            if (CollectionUtil.isNotEmpty(roles)){
-                if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){
-                    List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList());
-                    roleIds.addAll(allRoleId);
-                }else{
-                    roleIds.add(param.getRoleId());
-                }
-            }
-        }
+        roleIds.add(param.getRoleId());
+        //查询当前角色是否项目经理
+//        List<Long> roleIds = new ArrayList<>();
+//        List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId());
+//        if (CollectionUtil.isNotEmpty(roleList)){
+//            List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList());
+//            if (CollectionUtil.isNotEmpty(roles)){
+//                if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){
+//                    List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList());
+//                    roleIds.addAll(allRoleId);
+//                }else{
+//                    roleIds.add(param.getRoleId());
+//                }
+//            }
+//        }
         //TODO 季度未实现
         List<CTaskVo.QueryTask> regularTask = taskDetailDao.queryRegularTask(roleIds, param.getTimeUnit(), param.getTimeNode(), param.getQueryType(), query, timeFormat);
         //如果该时段没有任务向上或向下补充