diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java index 6bbc65d..e67bf43 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java @@ -65,11 +65,9 @@ public class BusIntegralConsumeController extends BaseController startPage(); busIntegralRecord.setIntegralType("sms"); List list1 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord); - clearPage(); - startPage(); + TableDataInfo rspData = getDataTable(list1); busIntegralRecord.setIntegralType("AI"); List list2 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord); - clearPage(); list1 = list1.stream().map(bean -> { for(BusIntegralRecord busIntegralRecord1:list2){ if(busIntegralRecord1.getAccount().equals(bean.getAccount())){ @@ -79,7 +77,8 @@ public class BusIntegralConsumeController extends BaseController } return bean; }).collect(Collectors.toList()); - return getDataTable(list1); + rspData.setRows(list1); + return rspData; } /**