Commit 2644dbf0b44ee9808f8a864744a6e7afb483dc4f
1 parent
3f6dd5df81
Exists in
master
and in
6 other branches
追访相关
Showing 1 changed file with 3 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
View file @
2644dbf
| ... | ... | @@ -199,7 +199,7 @@ |
| 199 | 199 | |
| 200 | 200 | @Override |
| 201 | 201 | public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, String key, Integer trackType, Integer page, Integer limit, Integer userId) { |
| 202 | - PageResult pageResult = new PageResult(); | |
| 202 | + PageResult pageResult = null; | |
| 203 | 203 | List<Map<String, Object>> restList = new ArrayList<>(); |
| 204 | 204 | boolean flag = false; // 判断需不需要对patients进行查询 |
| 205 | 205 | Set<String> parentIds = new HashSet<>(); |
| ... | ... | @@ -272,8 +272,8 @@ |
| 272 | 272 | trackDowncCriteria.and("parentId").in(parentIds); |
| 273 | 273 | } |
| 274 | 274 | trackDowncCriteria.and("yn").is(1).and("trackDownTransfer").in(Arrays.asList(2, 3)); |
| 275 | - PageResult mongoPage = findMongoPage(TrackDown.class, Query.query(trackDowncCriteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); | |
| 276 | - List<TrackDown> trackDowns = (List<TrackDown>) mongoPage.getGrid(); | |
| 275 | + pageResult = findMongoPage(TrackDown.class, Query.query(trackDowncCriteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); | |
| 276 | + List<TrackDown> trackDowns = (List<TrackDown>) pageResult.getGrid(); | |
| 277 | 277 | for (TrackDown trackDown : trackDowns) { |
| 278 | 278 | Map<String, Object> temp = new HashMap<>(); |
| 279 | 279 |