From f869b1369002566b1e1df29d11faeecb10e3b262 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 13 一月 2025 20:38:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 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 123e8b0..784af0f 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 @@ -138,9 +138,10 @@ Long appUserId = null; if (!StringUtils.isEmpty(phone)){ AppUser appUser1 = appUserService.getOne(new LambdaQueryWrapper<AppUser>() - .eq(AppUser::getPhone, phone)); - appUserId = appUser1.getId(); - + .like(AppUser::getPhone, phone)); + if (appUser1 != null){ + appUserId = appUser1.getId(); + } } Page<UserCoupon> page = userCouponService.lambdaQuery() -- Gitblit v1.7.1