From 6e05714e46e95360633206e16784afbf28f23360 Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Thu, 17 Sep 2020 09:23:46 +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=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=AF=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

---
 .../dispose/manager/impl/DisposeDeviceManagerImpl.java   | 9 ++++++---
 .../com/dispose/manager/impl/DisposeTaskManagerImpl.java | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
index a388dce8..3c541dd2 100644
--- a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
+++ b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
@@ -223,6 +223,7 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
     @Override
     public MulReturnType<PageInfo<DisposeDevice>, List<DisposeDevice>> getPagesOfDevices(Integer startPage,
                                                                                          Integer pageSize) {
+        List<DisposeDevice> rspList = new ArrayList<>();
         // 设置分页信息
         PageHelper.startPage(startPage, pageSize);
 
@@ -236,9 +237,11 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
         // 获取分页信息
         PageInfo<DisposeDevice> pageInfo = new PageInfo<>(devList);
 
-        // 返回实际数据
-        List<Long> idArray = devList.stream().map(DisposeDevice::getId).collect(Collectors.toList());
-        List<DisposeDevice> rspList = disposeDeviceMapper.selectByIdSet(idArray);
+        if(devList.size() > 0) {
+            // 返回实际数据
+            List<Long> idArray = devList.stream().map(DisposeDevice::getId).collect(Collectors.toList());
+            rspList.addAll(disposeDeviceMapper.selectByIdSet(idArray));
+        }
 
         return new MulReturnType<>(pageInfo, rspList);
     }
diff --git a/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java
index 1703f30d..0a878960 100644
--- a/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java
+++ b/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java
@@ -119,6 +119,7 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager {
     @Override
     public MulReturnType<PageInfo<DisposeTask>, List<DisposeTask>> getPagesOfTask(Integer startPage,
                                                                                   Integer pageSize) {
+        List<DisposeTask> rspList = new ArrayList<>();
         // 设置分页信息
         PageHelper.startPage(startPage, pageSize);
         List<DisposeTask> taskList = disposeTaskMapper.selectAll();
@@ -129,8 +130,10 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager {
 
         PageInfo<DisposeTask> pageInfo = new PageInfo<>(taskList);
 
-        List<Long> idArray = taskList.stream().map(DisposeTask::getId).collect(Collectors.toList());
-        List<DisposeTask> rspList = disposeTaskMapper.selectByIdSet(idArray);
+        if(taskList.size() > 0) {
+            List<Long> idArray = taskList.stream().map(DisposeTask::getId).collect(Collectors.toList());
+            rspList.addAll(disposeTaskMapper.selectByIdSet(idArray));
+        }
 
         return new MulReturnType<>(pageInfo, rspList);
     }