Commit e24609b455ebf5b2e25c7f96f3e5d9a92adefd54
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java
View file @
e24609b
| ... | ... | @@ -3,6 +3,7 @@ |
| 3 | 3 | import com.lyms.platform.biz.dal.LisCrisisItemDao; |
| 4 | 4 | import com.lyms.platform.biz.service.LisCrisisItemService; |
| 5 | 5 | import com.lyms.platform.common.annotation.TokenRequired; |
| 6 | +import com.lyms.platform.common.result.CommonResult; | |
| 6 | 7 | import com.lyms.platform.common.utils.DateUtil; |
| 7 | 8 | import com.lyms.platform.common.utils.ResultUtils; |
| 8 | 9 | import com.lyms.platform.pojo.LisCrisisItem; |
| ... | ... | @@ -93,7 +94,11 @@ |
| 93 | 94 | |
| 94 | 95 | list.add(map); |
| 95 | 96 | } |
| 96 | - ResultUtils.buildSuccessResultAndWrite(response, list); | |
| 97 | + | |
| 98 | + CommonResult result = new CommonResult(); | |
| 99 | + result.setList(list); | |
| 100 | + result.setPageInfo(query.getPageInfo()); | |
| 101 | + ResultUtils.buildSuccessResultAndWrite(response, result); | |
| 97 | 102 | }else { |
| 98 | 103 | ResultUtils.buildParameterErrorResultAndWrite(response,"没有查询到数据"); |
| 99 | 104 | } |