From 8a623574fce581cd70aaa1919f460fb42764d335 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Fri, 20 May 2022 09:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E9=A1=B5=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/XhpcClearingHistoryOrderController.java        | 1 -
 .../service/impl/XhpcClearingHistoryOrderServiceImpl.java     | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
index 904690a6..9952d481 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
@@ -103,7 +103,6 @@ public class XhpcClearingHistoryOrderController extends BaseController {
     @GetMapping("/getOrderPage")
     public TableDataInfo getOrderPage(HttpServletRequest request, String operatorId){
         LoginUser loginUser = logUserUtils.getLogUser(request);
-        startPage();
         Map<String, Object> params = new HashMap<>();
 
         if(StringUtils.isEmpty(operatorId)){
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java
index 73947e12..18ee3d4d 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java
@@ -10,6 +10,7 @@ import com.xhpc.activity.service.XhpcClearingHistoryOrderService;
 import com.xhpc.activity.vo.ClearingOrderVo;
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.StringUtils;
+import com.xhpc.common.core.web.service.BaseService;
 import com.xhpc.common.security.service.TokenService;
 import com.xhpc.common.util.UserTypeUtil;
 import com.xhpc.system.api.domain.SysUser;
@@ -28,7 +29,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Transactional
-public class XhpcClearingHistoryOrderServiceImpl implements XhpcClearingHistoryOrderService {
+public class XhpcClearingHistoryOrderServiceImpl extends BaseService implements XhpcClearingHistoryOrderService {
 
     @Resource
     XhpcClearingHistoryOrderMapper historyOrderMapper;
@@ -158,6 +159,7 @@ public class XhpcClearingHistoryOrderServiceImpl implements XhpcClearingHistoryO
     // ===========================
     @Override
     public List<Map<String, Object>> getOrderPage(Map<String, Object> params) {
+        startPage();
         return historyOrderMapper.selectOrderPage(params);
     }