From 596de3b497766237d7cc1d2bdf7e984d88e2b3dc Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Fri, 9 Aug 2024 02:47:08 +0800
Subject: [PATCH] =?UTF-8?q?1;=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/BusIntegralConsumeController.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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<BusIntegralRecord> list1 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
-        clearPage();
-        startPage();
+        TableDataInfo rspData = getDataTable(list1);
         busIntegralRecord.setIntegralType("AI");
         List<BusIntegralRecord> 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;
     }
 
     /**