From 2644dbf0b44ee9808f8a864744a6e7afb483dc4f Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 11 Jan 2018 15:41:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/service/impl/TrackDownServiceImpl.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
index 0106703..1db8311a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
@@ -199,7 +199,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
 
     @Override
     public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, String key, Integer trackType, Integer page, Integer limit, Integer userId) {
-        PageResult pageResult = new PageResult();
+        PageResult pageResult = null;
         List<Map<String, Object>> restList = new ArrayList<>();
         boolean flag = false; // 判断需不需要对patients进行查询
         Set<String> parentIds = new HashSet<>();
@@ -272,8 +272,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
                 trackDowncCriteria.and("parentId").in(parentIds);
             }
             trackDowncCriteria.and("yn").is(1).and("trackDownTransfer").in(Arrays.asList(2, 3));
-            PageResult mongoPage = findMongoPage(TrackDown.class, Query.query(trackDowncCriteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
-            List<TrackDown> trackDowns = (List<TrackDown>) mongoPage.getGrid();
+            pageResult = findMongoPage(TrackDown.class, Query.query(trackDowncCriteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
+            List<TrackDown> trackDowns = (List<TrackDown>) pageResult.getGrid();
             for (TrackDown trackDown : trackDowns) {
                 Map<String, Object> temp = new HashMap<>();
 
-- 
1.8.3.1