From b94399a7ab0a737131a189e438e1a135556a0dec Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 14 一月 2025 10:17:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java index c88dd4f..06f5dd9 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java @@ -142,6 +142,8 @@ .like(AppUser::getPhone, phone)); if (!CollectionUtils.isEmpty(appUserList)){ appUserIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList()); + }else { + return R.ok(Page.of(pageNum, pageSize)); } } -- Gitblit v1.7.1