From 7f612bcbb7de9efdd0ca39eb8b3b90938aad5d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 10 Nov 2023 18:48:07 +0800
Subject: [PATCH] 2.0

---
 xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java   | 3 +--
 .../main/java/com/xm/core/service/XmTaskExecuserService.java   | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

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<String,XmTask> allowTasksDbMap=new HashMap<>();
 			Map<String,XmTask>  noAllowTasksDbMap=new HashMap<>();
 			XmProject projectDb=xmProjectService.getProjectFromCache(parentTask.getProjectId());
-			List<Dept> pgroups= groupService.getSubDeptList(projectDb.getDeptid());
+			List<XmGroupVo> 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<XmTaskExecuserMapper,XmTa
 		return baseMapper.selectListMapByWhereWithTask(page,qw,ext);
 	}
 
+	public List<Map<String, Object>> selectListMapByWhere(IPage page, QueryWrapper<XmTaskExecuser> qw, Map<String, Object> params) {
+		return baseMapper.selectListMapByWhere(page,qw,params);
+	}
 }