From 8ff300e52fac2e00d46a120f5048e9e693c1332d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 6 Dec 2023 17:08:27 +0800
Subject: [PATCH] =?UTF-8?q?2.0-=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xm/core/ctrl/XmTaskController.java  | 8 +++++---
 .../src/main/java/com/xm/core/service/XmTaskService.java  | 4 ++--
 2 files changed, 7 insertions(+), 5 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 09fc5ce9..b0adad1a 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
@@ -140,7 +140,7 @@ public class XmTaskController {
 			params.put("compete",user.getUserid());
 		}
 		QueryWrapper<XmTask> qw = QueryTools.initQueryWrapper(XmTask.class , params);
-		List<Map<String,Object>> datas = xmTaskService.getTask(params);	//列出XmTask列表
+		List<Map<String,Object>> datas = xmTaskService.getTask(page,qw,params);	//列出XmTask列表
  		if("1".equals(params.get("withParents"))  && !"1".equals(params.get("isTop"))&& datas.size()>0){
 			Set<String> pidPathsSet=new HashSet<>();
 			Set<String> idSet=new HashSet<>();
@@ -155,7 +155,9 @@ public class XmTaskController {
 			}
 			List<String> ids=pidPathsSet.stream().filter(i->!idSet.contains(i)).collect(Collectors.toList());
 			if(ids!=null && ids.size()>0){
-				List<Map<String,Object>> parentList=xmTaskService.getTask(map("ids",ids));
+				QueryWrapper qw2=new QueryWrapper();
+				qw2.in("id",ids.toArray());
+				List<Map<String,Object>> parentList=xmTaskService.listMaps(qw2);
  				if(parentList!=null && parentList.size()>0){
 					datas.addAll(parentList);
 					return Result.ok().setData(datas).setTotal(page.getSize()+parentList.size());
@@ -189,7 +191,7 @@ public class XmTaskController {
 		params.put("toTaskCenter","1");
 
 		QueryWrapper<XmTask> qw = QueryTools.initQueryWrapper(XmTask.class , params);
-		List<Map<String,Object>> datas=xmTaskService.getTask(params);
+		List<Map<String,Object>> datas=xmTaskService.getTask(page,qw,params);
 
 		return Result.ok().setData(datas).setTotal(page.getTotal());
 		
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
index 5f4cb09c..7aec6480 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
@@ -197,8 +197,8 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
 		baseMapper.updateTaskChildrenCntByTaskId(taskId);
 	}
 
-	public List<Map<String,Object>> getTask(Map<String,Object> xmTask){  
-		List<Map<String,Object>> mapList = this.selectListMapByWhere(QueryTools.initPage(xmTask),QueryTools.initQueryWrapper(XmTask.class,xmTask),xmTask);//所有数据 
+	public List<Map<String,Object>> getTask(IPage page,QueryWrapper<XmTask> qw,Map<String,Object> xmTask){
+		List<Map<String,Object>> mapList = this.selectListMapByWhere(page,qw,xmTask);//所有数据
 		return mapList;
 	}
 	@Transactional