From 44be81d889135597dbd35f4ef91fcfa9bf6151dd Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Wed, 19 Oct 2016 21:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/controller/LisCrisisItemController.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java
index ffa98c7..0b22ab5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java
@@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.controller;
 import com.lyms.platform.biz.dal.LisCrisisItemDao;
 import com.lyms.platform.biz.service.LisCrisisItemService;
 import com.lyms.platform.common.annotation.TokenRequired;
+import com.lyms.platform.common.result.CommonResult;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.ResultUtils;
 import com.lyms.platform.pojo.LisCrisisItem;
@@ -93,7 +94,11 @@ public class LisCrisisItemController {
 
                 list.add(map);
             }
-            ResultUtils.buildSuccessResultAndWrite(response, list);
+
+            CommonResult result = new CommonResult();
+            result.setList(list);
+            result.setPageInfo(query.getPageInfo());
+            ResultUtils.buildSuccessResultAndWrite(response, result);
         }else {
             ResultUtils.buildParameterErrorResultAndWrite(response,"没有查询到数据");
         }
-- 
1.8.3.1