From d09299d5840248166399f13640cc205a59f33ffe Mon Sep 17 00:00:00 2001
From: wangguocheng <jing121710@sina.com>
Date: Fri, 17 May 2024 14:09:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=BE=97=E5=85=8D=E5=8D=95=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java           | 4 ++++
 src/main/resources/mapper/TbOrderInfoMapper.xml               | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index f0b89d0..36881b7 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -25,6 +25,7 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -396,6 +397,9 @@ public class OrderService {
             }
         }
         PageInfo pageInfo = new PageInfo(list);
+        if (page > pageInfo.getPages()) {
+            pageInfo.setList(Collections.emptyList());
+        }
         return Result.success(CodeEnum.SUCCESS, pageInfo);
     }
 }
diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml
index bbbbdbc..1a0f845 100644
--- a/src/main/resources/mapper/TbOrderInfoMapper.xml
+++ b/src/main/resources/mapper/TbOrderInfoMapper.xml
@@ -563,6 +563,6 @@
     <select id="selectWinnerByUserId" resultType="com.chaozhanggui.system.cashierservice.entity.TbOrderInfo">
         select toi.*,two.order_no as winnnerNo,tui.nick_name as userName from tb_order_info toi left join tb_wining_user two on two.order_no = toi.order_no
                                                                                                 left join tb_user_info tui on tui.id = toi.user_id
-        where toi.user_id = #{userId} and
+        where toi.user_id = #{userId}
     </select>
 </mapper>
\ No newline at end of file