From 37393c35ca950d7e99233a1893bbda4f9599a89d Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Mon, 12 Oct 2020 11:07:30 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=AD=A3=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/impl/DisposeTaskManagerImpl.java   | 18 +++++++-----------
 .../test/testcase/qa/v200/P2TaskList.java      |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java
index 2d34a348..6dff034e 100644
--- a/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java
+++ b/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java
@@ -4,7 +4,6 @@ import com.dispose.common.DisposeCapacityType;
 import com.dispose.common.DisposeTaskStatus;
 import com.dispose.common.ErrorCode;
 import com.dispose.manager.DisposeTaskManager;
-import com.dispose.mapper.DeviceTaskMapper;
 import com.dispose.mapper.DisposeTaskMapper;
 import com.dispose.pojo.entity.DisposeTask;
 import com.dispose.pojo.po.MulReturnType;
@@ -31,12 +30,6 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager {
     @Resource
     private DisposeTaskMapper disposeTaskMapper;
 
-    /**
-     * The Device task mapper.
-     */
-    @Resource
-    private DeviceTaskMapper deviceTaskMapper;
-
     /**
      * Gets dispose task.
      *
@@ -130,6 +123,7 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager {
     public MulReturnType<PageInfo<DisposeTask>, List<DisposeTask>> getPagesOfTask(List<Long> taskId,
                                                                                   Integer startPage,
                                                                                   Integer pageSize) {
+        PageInfo<DisposeTask> pageInfo;
         List<DisposeTask> taskList = new ArrayList<>();
 
         // 设置分页信息
@@ -137,13 +131,15 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager {
 
         if(taskId.size() > 0) {
             taskList.addAll(disposeTaskMapper.selectByIdSet(taskId));
+            pageInfo = new PageInfo<>(taskList);
         } else {
-            taskList.addAll(disposeTaskMapper.selectPageAll());
+            List<DisposeTask> preList = disposeTaskMapper.selectPageAll();
+            pageInfo = new PageInfo<>(preList);
+
+            preList.forEach(k -> taskId.add(k.getId()));
+            taskList.addAll(disposeTaskMapper.selectByIdSet(taskId));
         }
 
-        PageInfo<DisposeTask> pageInfo = new PageInfo<>(taskList);
-
-
         return new MulReturnType<>(pageInfo, taskList);
     }
 }
diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java
index 52b417d4..3c9a5461 100644
--- a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java
+++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java
@@ -46,7 +46,7 @@ public class P2TaskList {
                 Assert.assertEquals((long) v.getCode(), e.getHttpCode());
                 //Assert.assertEquals((long) v.getMsgContent().getStatus(), e.getCode());
 
-                Assert.assertEquals((long) v.getMsgContent().getCurPageNumber(), 1);
+                Assert.assertEquals((long) v.getMsgContent().getCurPageNumber(), 2);
                 Assert.assertEquals((long)v.getMsgContent().getPageSize(), 20);
 
                 Assert.assertNotNull(v.getMsgContent().getItems());