diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index d1315146..fb2b0051 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -12,7 +12,6 @@ import com.mdp.core.utils.BaseUtils; import com.mdp.core.utils.NumberUtil; import com.mdp.core.utils.RequestUtils; import com.mdp.msg.client.PushNotifyMsgService; -import com.mdp.safe.client.entity.Dept; import com.mdp.safe.client.entity.User; import com.mdp.safe.client.utils.LoginUtils; import com.mdp.sensitive.SensitiveWordService; @@ -1320,7 +1319,7 @@ public class XmTaskController { Map allowTasksDbMap=new HashMap<>(); Map noAllowTasksDbMap=new HashMap<>(); XmProject projectDb=xmProjectService.getProjectFromCache(parentTask.getProjectId()); - List pgroups= groupService.getSubDeptList(projectDb.getDeptid()); + List pgroups= groupService.getProjectGroupVoList(projectDb.getId()); boolean isAdm=groupService.checkUserIsProjectAdm(parentTask.getProjectId(),user.getUserid()); if(!isAdm){ for (XmTask task : canOpxmTasks) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index efdae435..dc60a08c 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -266,5 +266,8 @@ public class XmTaskExecuserService extends BaseService> selectListMapByWhere(IPage page, QueryWrapper qw, Map params) { + return baseMapper.selectListMapByWhere(page,qw,params); + } }